Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-10 15:14:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7002

Browse source 
7002: Extension conflict check detects more combinations r=extremegf a=extremegf

This will also detect conflicts with kalitaalexey.vscode-rust and work correctly after RA is integrated with rust-lang.rust extension.

Co-authored-by: Przemyslaw Horban <p.horban@invinets.com>
Co-authored-by: P. Horban <extremegf@gmail.com>
This commit is contained in:
bors[bot] 2020-12-22 15:23:36 +00:00 committed by GitHub
commit 5506933a93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
editors/code/src/main.ts
View file

@ -131,7 +131,7 @@ async function tryActivate(context: vscode.ExtensionContext) {
ctx.pushCleanup(activateTaskProvider(workspaceFolder, ctx.config));
activateInlayHints(ctx);
warnAboutRustLangExtensionConflict();
warnAboutExtensionConflicts();
vscode.workspace.onDidChangeConfiguration(
_ => ctx?.client?.sendNotification('workspace/didChangeConfiguration', { settings: "" }),
@ -411,11 +411,21 @@ async function queryForGithubToken(state: PersistentState): Promise<void> {
}
}
function warnAboutRustLangExtensionConflict() {
const rustLangExt = vscode.extensions.getExtension("rust-lang.rust");
if (rustLangExt !== undefined) {
function warnAboutExtensionConflicts() {
const conflicting = [
["rust-analyzer", "matklad.rust-analyzer"],
["Rust", "rust-lang.rust"],
["Rust", "kalitaalexey.vscode-rust"],
];
const found = conflicting.filter(
nameId => vscode.extensions.getExtension(nameId[1]) !== undefined);
if (found.length > 1) {
const fst = found[0];
const sec = found[1];
vscode.window.showWarningMessage(
"You have both rust-analyzer (matklad.rust-analyzer) and Rust (rust-lang.rust) " +
`You have both the ${fst[0]} (${fst[1]}) and ${sec[0]} (${sec[1]}) ` +
"plugins enabled. These are known to conflict and cause various functions of " +
"both plugins to not work correctly. You should disable one of them.", "Got it");
};