Fix a bug where rustup didn't install all of the required components

Author: Xanewok

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Unreleased
 
+* Fix a bug where rustup didn't install all of the required components for the RLS
 * Don't warn on custom `rust-client.channel` value such as `1.39.0` in properties.json
 * Add a new `default` value for `rust-client.channel` (same as setting it explicitly to `null`)
 * Add a self-closing angular (`>`) bracket whenever opening one (`<`) has been typed

src/tasks.ts

@@ -131,22 +131,28 @@ export async function runTaskCommand(
   displayName: string,
   folder?: WorkspaceFolder,
 ) {
-  const uniqueId = crypto.randomBytes(20).toString();
+  // Task finish callback does not preserve concrete task definitions, we so
+  // disambiguate finished tasks via executed command line.
+  const commandLine = `${command} ${args.join(' ')}`;
 
   const task = new Task(
-    { label: uniqueId, type: 'shell' },
-    folder ? folder : workspace.workspaceFolders![0],
+    { type: 'shell' },
+    folder || workspace.workspaceFolders![0],
     displayName,
     TASK_SOURCE,
-    new ShellExecution(`${command} ${args.join(' ')}`, {
+    new ShellExecution(commandLine, {
       cwd: cwd || (folder && folder.uri.fsPath),
       env,
     }),
   );
 
   return new Promise(resolve => {
     const disposable = tasks.onDidEndTask(({ execution }) => {
-      if (execution.task === task) {
+      const taskExecution = execution.task.execution;
+      if (
+        taskExecution instanceof ShellExecution &&
+        taskExecution.commandLine === commandLine
+      ) {
         disposable.dispose();
         resolve();
       }