Skip to content

Commit

Permalink
optimize data passing
Browse files Browse the repository at this point in the history
  • Loading branch information
zhixzhan committed Nov 28, 2019
1 parent 8ff61f2 commit 7a3aac9
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions Composer/packages/lib/code-editor/src/LgEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,15 @@ declare global {
}
}

async function initializeDocuments(lgOption) {
async function initializeDocuments(lgOption: LGOption | undefined, uri: string) {
const languageClient = window.monacoLGEditorInstance;
if (languageClient) {
await languageClient.onReady();
languageClient.sendRequest('initializeDocuments', lgOption);
if (lgOption && lgOption.inline) {
languageClient.sendRequest('initializeDocuments', { ...lgOption, uri });
} else {
languageClient.sendRequest('initializeDocuments', { uri });
}
}
}

Expand All @@ -63,7 +67,7 @@ export function LgEditor(props: LGLSPEditorProps) {
...props.options,
};

const { lgOption = {}, languageServer, ...restProps } = props;
const { lgOption, languageServer, ...restProps } = props;
const lgServer = languageServer || defaultLGServer;

const editorWillMount = (monaco: typeof monacoEditor) => {
Expand All @@ -88,14 +92,14 @@ export function LgEditor(props: LGLSPEditorProps) {
if (!window.monacoLGEditorInstance) {
window.monacoLGEditorInstance = languageClient;
}
initializeDocuments({ ...lgOption, uri });
initializeDocuments(lgOption, uri);
const disposable = languageClient.start();
connection.onClose(() => disposable.dispose());
},
});
} else {
const uri = get(editor.getModel(), 'uri._formatted', '');
initializeDocuments({ ...lgOption, uri });
initializeDocuments(lgOption, uri);
}

if (typeof props.editorDidMount === 'function') {
Expand Down

0 comments on commit 7a3aac9

Please sign in to comment.