Merge branch 'master' into sync-from-rust

lnicola · lnicola · commit 4efdb470e974 · 2024-02-05T10:33:31.000+02:00
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
@@ -207,7 +207,7 @@ function checkConflictingExtensions() {
     if (vscode.extensions.getExtension("panicbit.cargo")) {
         vscode.window
             .showWarningMessage(
-                `You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled` +
+                `You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled, ` +
                     'you can disable it or set {"cargo.automaticCheck": false} in settings.json to avoid invoking cargo twice',
                 "Got it",
             )

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ function checkConflictingExtensions() {`
`207`	`207`	`if (vscode.extensions.getExtension("panicbit.cargo")) {`
`208`	`208`	`vscode.window`
`209`	`209`	`.showWarningMessage(`
`210`		- `You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled` +
	`210`	+ `You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled, ` +
`211`	`211`	`'you can disable it or set {"cargo.automaticCheck": false} in settings.json to avoid invoking cargo twice',`
`212`	`212`	`"Got it",`
`213`	`213`	`)`