Commit d2bb4717 authored by Christoph Cullmann's avatar Christoph Cullmann

LSP: support ocaml merlin


(cherry picked from commit 8b9f75ef)
parent b69931ce
......@@ -170,6 +170,8 @@ static QString languageId(const QString &mode)
*/
if (result.contains(QLatin1String("fortran"))) {
result = QStringLiteral("fortran");
} else if (result.contains(QLatin1String("objective caml"))) {
result = QStringLiteral("ocaml");
}
/**
......
......@@ -37,6 +37,10 @@
"command": ["rls"],
"rootIndicationFileNames": ["Cargo.lock", "Cargo.toml"],
"url": "https://github.com/rust-lang/rls"
},
"ocaml": {
"command": ["ocamlmerlin-lsp"],
"url": "https://github.com/ocaml/merlin"
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment