use merlin-lsp for all projects

Rusty Key · Rusty Key · commit 10728236e8fc · 2019-02-24T15:35:53.000+03:00
diff --git a/src/client/index.ts b/src/client/index.ts
@@ -36,11 +36,8 @@ class ErrorHandler {
 }
 
 export async function launch(context: vscode.ExtensionContext): Promise<void> {
-  if (await isEsyProject()) {
-    return launchMerlinLsp(context, true);
-  } else {
-    return launchOCamlLanguageServer(context);
-  }
+  const isEasyProject = await isEsyProject();
+  return launchMerlinLsp(context, isEasyProject);
 }
 
 async function isEsyProject() {

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,8 @@ class ErrorHandler {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`export async function launch(context: vscode.ExtensionContext): Promise<void> {`
`39`		`- if (await isEsyProject()) {`
`40`		`- return launchMerlinLsp(context, true);`
`41`		`- } else {`
`42`		`- return launchOCamlLanguageServer(context);`
`43`		`- }`
	`39`	`+ const isEasyProject = await isEsyProject();`
	`40`	`+ return launchMerlinLsp(context, isEasyProject);`
`44`	`41`	`}`
`45`	`42`
`46`	`43`	`async function isEsyProject() {`