Merge rust-lang#10093

10093: fix: Remove incorrectly filtering VS Code cargo task execution resolution by scope r=oeed a=oeed

This fixes rust-lang#9093 ​introduced by rust-lang#8995.

A filter was present on the function that adds the execution definition to Cargo tasks. This would mean Cargo tasks defined in workspaces (i.e. `.code-workspace` files) would not be given an execution, leading to a `There is no task provider registered for tasks of type "cargo".` error as descibed in rust-lang#9093. I have made a minimum reproduction setup [here](https://github.com/oeed/ra-workspace).

This PR essentially removes that check. The `if (scope) { ... }` is to handle the case where `task.scope === undefined` using a deprecated constructor. I'm not sure if that is ever likely to occur and can remove if not needed.

There is some discussion about whether it's necessary to filter the tasks before building them. From my understanding, it shouldn't be needed as we should provide an execution for all `cargo` tasks; but I'm not overly familiar with VS Code internals so I could be wrong. For more info please see [the discussion](rust-lang#8995 (comment)) on rust-lang#8995

Co-authored-by: Oliver Cooper <[email protected]>

Author: 2 people

crates/ide/src/runnables.rs

@@ -229,15 +229,24 @@ fn find_related_tests(
         for (file_id, refs) in refs.into_iter().flat_map(|refs| refs.references) {
             let file = sema.parse(file_id);
             let file = file.syntax();
-            let functions = refs.iter().filter_map(|(range, _)| {
-                let token = file.token_at_offset(range.start()).next()?;
-                let token = sema.descend_into_macros(token);
-                token
-                    .ancestors()
-                    .find_map(ast::Fn::cast)
-                    .map(|f| hir::InFile::new(sema.hir_file_for(f.syntax()), f))
+
+            // create flattened vec of tokens
+            let tokens = refs.iter().flat_map(|(range, _)| {
+                match file.token_at_offset(range.start()).next() {
+                    Some(token) => sema.descend_into_macros_many(token).into_vec(),
+                    None => {
+                        vec![]
+                    }
+                }
             });
 
+            // find first suitable ancestor
+            let functions = tokens
+                .map(|token| token.ancestors().find_map(ast::Fn::cast))
+                // remove instances where no ancestor could be found ( = find_map returns `None`)
+                .filter_map(|f| f)
+                .map(|f| hir::InFile::new(sema.hir_file_for(f.syntax()), f));
+
             for fn_def in functions {
                 // #[test/bench] expands to just the item causing us to lose the attribute, so recover them by going out of the attribute
                 let InFile { value: fn_def, .. } = &fn_def.node_with_attributes(sema.db);

editors/code/src/tasks.ts

@@ -58,21 +58,15 @@ class CargoTaskProvider implements vscode.TaskProvider {
 
         if (definition.type === TASK_TYPE && definition.command) {
             const args = [definition.command].concat(definition.args ?? []);
-            if (isWorkspaceFolder(task.scope)) {
-                return await buildCargoTask(task.scope, definition, task.name, args, this.config.cargoRunner);
-            }
+            return await buildCargoTask(task.scope, definition, task.name, args, this.config.cargoRunner);
         }
 
         return undefined;
     }
 }
 
-function isWorkspaceFolder(scope?: any): scope is vscode.WorkspaceFolder {
-    return (scope as vscode.WorkspaceFolder).name !== undefined;
-}
-
 export async function buildCargoTask(
-    target: vscode.WorkspaceFolder,
+    scope: vscode.WorkspaceFolder | vscode.TaskScope | undefined,
     definition: CargoTaskDefinition,
     name: string,
     args: string[],
@@ -117,7 +111,9 @@ export async function buildCargoTask(
 
     return new vscode.Task(
         definition,
-        target,
+        // scope can sometimes be undefined. in these situations we default to the workspace taskscope as
+        // recommended by the official docs: https://code.visualstudio.com/api/extension-guides/task-provider#task-provider)
+        scope ?? vscode.TaskScope.Workspace,
         name,
         TASK_SOURCE,
         exec,