From 863202971e1dbb70fd1f511cd35df47e94c9fe1f Mon Sep 17 00:00:00 2001
From: Zhixiang Zhan <zhixzhan@microsoft.com>
Date: Wed, 1 Apr 2020 03:03:45 +0800
Subject: [PATCH] fix editor warning (#2446)

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
---
 Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts | 2 +-
 Composer/packages/lib/shared/src/resolverFactory.ts        | 4 ++--
 Composer/packages/ui-plugins/lg/src/LgField.tsx            | 4 ----
 Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts b/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts
index 16840c8ecd..a475fc6acb 100644
--- a/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts
+++ b/Composer/packages/lib/indexers/src/utils/diagnosticUtil.ts
@@ -48,7 +48,7 @@ export function isDiagnosticWithInRange(diagnostic: Diagnostic, range: CodeRange
 }
 
 export function filterTemplateDiagnostics(diagnostics: Diagnostic[], { range }: { range?: CodeRange }): Diagnostic[] {
-  if (!range) return diagnostics;
+  if (!range) return [];
   const filteredDiags = diagnostics.filter(d => {
     return d.range && isDiagnosticWithInRange(d, range);
   });
diff --git a/Composer/packages/lib/shared/src/resolverFactory.ts b/Composer/packages/lib/shared/src/resolverFactory.ts
index 219fd54548..85300d03b7 100644
--- a/Composer/packages/lib/shared/src/resolverFactory.ts
+++ b/Composer/packages/lib/shared/src/resolverFactory.ts
@@ -28,7 +28,7 @@ export function importResolverGenerator(
    *
    *  would resolve to common.en-us.lg || common.lg
    *
-   *  source =  todosample || todosample.en-us || todosample.en-us.lg || todosample.lg
+   *  source =  todosample || todosample.en-us || todosample.en-us.lg || todosample.lg  || .
    *  resourceId =   common || common.lg || ../common/common.lg
    *
    */
@@ -36,7 +36,7 @@ export function importResolverGenerator(
     // eslint-disable-next-line security/detect-non-literal-regexp
     const extReg = new RegExp(ext + '$');
     const sourceId = getFileName(source).replace(extReg, '');
-    const locale = sourceId.split('.').length > 1 ? sourceId.split('.').pop() : defaultLocale;
+    const locale = /\w\.\w/.test(sourceId) ? sourceId.split('.').pop() : defaultLocale;
     const targetId = getFileName(resourceId).replace(extReg, '');
 
     const targetFile =
diff --git a/Composer/packages/ui-plugins/lg/src/LgField.tsx b/Composer/packages/ui-plugins/lg/src/LgField.tsx
index 24a665cab4..2dc33533d8 100644
--- a/Composer/packages/ui-plugins/lg/src/LgField.tsx
+++ b/Composer/packages/ui-plugins/lg/src/LgField.tsx
@@ -56,10 +56,6 @@ const LgField: React.FC<FieldProps<string>> = props => {
     name: lgName,
     parameters: [],
     body: getInitialTemplate(name, value),
-    range: {
-      startLineNumber: 0,
-      endLineNumber: 2,
-    },
   };
 
   const diagnostics = lgFile ? filterTemplateDiagnostics(lgFile.diagnostics, template) : [];
diff --git a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
index ddd8e6fe9b..b7e9ab7c8a 100644
--- a/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
+++ b/Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx
@@ -9,7 +9,7 @@ import { LuIntentSection } from '@bfc/shared';
 
 const LuisIntentEditor: React.FC<FieldProps<string>> = props => {
   const { onChange, value, schema } = props;
-  const { currentDialog, designerId, luFiles, shellApi, locale } = useShellApi();
+  const { currentDialog, designerId, luFiles, shellApi, locale, projectId } = useShellApi();
   const luFile = luFiles.find(f => f.id === `${currentDialog.id}.${locale}`);
 
   let intentName = value;
@@ -47,7 +47,7 @@ const LuisIntentEditor: React.FC<FieldProps<string>> = props => {
   return (
     <LuEditor
       height={150}
-      luOption={{ fileId: luFile.id, sectionId: luIntent.Name }}
+      luOption={{ fileId: luFile.id, sectionId: luIntent.Name, projectId }}
       value={luIntent.Body}
       onChange={commitChanges}
       diagnostics={diagnostics}