fix: editor show error (microsoft#2939)

Co-authored-by: Andy Brown <asbrown002@gmail.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
lei9444 · May 8, 2020 · f8087d9 · f8087d9
1 parent ba715ab
commit f8087d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 40 deletions.
diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -173,8 +173,16 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
     }
   };
 
+  const getLuDiagnostics = (intent: string, triggerPhrases: string) => {
+    const content = '#' + intent + '\n' + triggerPhrases;
+    const { diagnostics } = luIndexer.parse(content);
+    return combineMessage(diagnostics);
+  };
+
   const onNameChange = (e, name) => {
-    setFormData({ ...formData, intent: name });
+    const errors = formData.errors;
+    errors.triggerPhrases = getLuDiagnostics(name, formData.triggerPhrases);
+    setFormData({ ...formData, intent: name, errors });
   };
 
   const onChangeRegEx = (e, pattern) => {
@@ -183,9 +191,7 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
 
   const onTriggerPhrasesChange = (body: string) => {
     const errors = formData.errors;
-    const content = '#' + formData.intent + '\n' + body;
-    const { diagnostics } = luIndexer.parse(content);
-    errors.triggerPhrases = combineMessage(diagnostics);
+    errors.triggerPhrases = getLuDiagnostics(formData.intent, body);
     setFormData({ ...formData, triggerPhrases: body, errors });
   };
 

diff --git a/Composer/packages/client/src/pages/language-understanding/code-editor.tsx b/Composer/packages/client/src/pages/language-understanding/code-editor.tsx
@@ -7,15 +7,12 @@ import { LuEditor, EditorDidMount } from '@bfc/code-editor';
 import get from 'lodash/get';
 import debounce from 'lodash/debounce';
 import isEmpty from 'lodash/isEmpty';
-import { luIndexer, filterTemplateDiagnostics } from '@bfc/indexers';
+import { filterTemplateDiagnostics } from '@bfc/indexers';
 import { RouteComponentProps } from '@reach/router';
 import querystring from 'query-string';
 import { CodeEditorSettings } from '@bfc/shared';
 
 import { StoreContext } from '../../store';
-import * as luUtil from '../../utils/luUtil';
-
-const { parse } = luIndexer;
 
 const lspServerPath = '/lu-language-server';
 
@@ -28,8 +25,7 @@ const CodeEditor: React.FC<CodeEditorProps> = props => {
   const { luFiles, locale, projectId, userSettings } = state;
   const { dialogId } = props;
   const file = luFiles.find(({ id }) => id === `${dialogId}.${locale}`);
-  const [diagnostics, setDiagnostics] = useState(get(file, 'diagnostics', []));
-  const [httpErrorMsg, setHttpErrorMsg] = useState('');
+  const diagnostics = get(file, 'diagnostics', []);
   const [luEditor, setLuEditor] = useState<any>(null);
 
   const search = props.location?.search ?? '';
@@ -105,37 +101,9 @@ const CodeEditor: React.FC<CodeEditorProps> = props => {
     [file, projectId]
   );
 
-  const updateDiagnostics = useMemo(
-    () =>
-      debounce((value: string) => {
-        if (!file) return;
-        const { id } = file;
-        if (inlineMode) {
-          if (!intent) return;
-          const { Name } = intent;
-          const { content } = file;
-          try {
-            const newContent = luUtil.updateIntent(content, Name, {
-              Name,
-              Body: value,
-            });
-            const { diagnostics } = parse(newContent, id);
-            setDiagnostics(diagnostics);
-          } catch (error) {
-            setHttpErrorMsg(error.error);
-          }
-        } else {
-          const { diagnostics } = parse(value, id);
-          setDiagnostics(diagnostics);
-        }
-      }, 1000),
-    [file, intent, projectId]
-  );
-
   const _onChange = useCallback(
     value => {
       setContent(value);
-      updateDiagnostics(value);
       if (!file) return;
       if (inlineMode) {
         updateLuIntent(value);
@@ -160,7 +128,6 @@ const CodeEditor: React.FC<CodeEditorProps> = props => {
     <LuEditor
       editorDidMount={editorDidMount}
       value={content}
-      errorMessage={httpErrorMsg}
       diagnostics={currentDiagnostics}
       luOption={luOption}
       languageServer={{

diff --git a/Composer/packages/lib/code-editor/src/constants.ts b/Composer/packages/lib/code-editor/src/constants.ts
@@ -6,7 +6,7 @@ import formatMessage from 'format-message';
 export const inlineModePlaceholder = formatMessage(`> add some example phrases to trigger this intent:
 > - please tell me the weather
 > - what is the weather like in '{city=Seattle}'
->
+
 > entity definitions:
 > @ ml city`);