Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/project-model/src/workspace.rs | 29 | ||||
| -rw-r--r-- | editors/code/src/ctx.ts | 18 | ||||
| -rw-r--r-- | editors/code/src/dependencies_provider.ts | 9 | ||||
| -rw-r--r-- | editors/code/src/toolchain.ts | 2 |
4 files changed, 30 insertions, 28 deletions
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs index 102f862522..5924287a37 100644 --- a/crates/project-model/src/workspace.rs +++ b/crates/project-model/src/workspace.rs @@ -1317,24 +1317,25 @@ fn sysroot_to_crate_graph( .filter_map(|krate| { let file_id = load(&sysroot[krate].root)?; - let env = Env::default(); - let display_name = CrateDisplayName::from_canonical_name(sysroot[krate].name.clone()); - let crate_id = crate_graph.add_crate_root( + let env = Env::default(); + let display_name = + CrateDisplayName::from_canonical_name(sysroot[krate].name.clone()); + let crate_id = crate_graph.add_crate_root( file_id, Edition::CURRENT, Some(display_name), None, - cfg_options.clone(), - None, - env, - false, - CrateOrigin::Lang(LangCrateOrigin::from(&*sysroot[krate].name)), - target_layout.clone(), - channel, - ); - Some((krate, crate_id)) - }) - .collect(), + cfg_options.clone(), + None, + env, + false, + CrateOrigin::Lang(LangCrateOrigin::from(&*sysroot[krate].name)), + target_layout.clone(), + channel, + ); + Some((krate, crate_id)) + }) + .collect(), }; for from in sysroot.crates() { for &to in sysroot[from].deps.iter() { diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts index 60ea769579..8bed74b88e 100644 --- a/editors/code/src/ctx.ts +++ b/editors/code/src/ctx.ts @@ -33,12 +33,12 @@ import { ExecOptions } from "child_process"; export type Workspace = | { kind: "Empty" } | { - kind: "Workspace Folder"; -} + kind: "Workspace Folder"; + } | { - kind: "Detached Files"; - files: vscode.TextDocument[]; -}; + kind: "Detached Files"; + files: vscode.TextDocument[]; + }; export function fetchWorkspace(): Workspace { const folders = (vscode.workspace.workspaceFolders || []).filter( @@ -52,9 +52,9 @@ export function fetchWorkspace(): Workspace { ? rustDocuments.length === 0 ? { kind: "Empty" } : { - kind: "Detached Files", - files: rustDocuments, - } + kind: "Detached Files", + files: rustDocuments, + } : { kind: "Workspace Folder" }; } @@ -476,4 +476,4 @@ export interface Disposable { dispose(): void; } -export type Cmd = (...args: any[]) => unknown;
\ No newline at end of file +export type Cmd = (...args: any[]) => unknown; diff --git a/editors/code/src/dependencies_provider.ts b/editors/code/src/dependencies_provider.ts index 0faf7665cf..59b3b27731 100644 --- a/editors/code/src/dependencies_provider.ts +++ b/editors/code/src/dependencies_provider.ts @@ -1,12 +1,13 @@ import * as vscode from "vscode"; import * as fspath from "path"; import * as fs from "fs"; -import {CtxInit} from "./ctx"; +import { CtxInit } from "./ctx"; import * as ra from "./lsp_ext"; -import {FetchDependencyListResult} from "./lsp_ext"; +import { FetchDependencyListResult } from "./lsp_ext"; export class RustDependenciesProvider - implements vscode.TreeDataProvider<Dependency | DependencyFile> { + implements vscode.TreeDataProvider<Dependency | DependencyFile> +{ dependenciesMap: { [id: string]: Dependency | DependencyFile }; ctx: CtxInit; @@ -131,4 +132,4 @@ export class DependencyFile extends vscode.TreeItem { } } -export type DependencyId = { id: string };
\ No newline at end of file +export type DependencyId = { id: string }; diff --git a/editors/code/src/toolchain.ts b/editors/code/src/toolchain.ts index c876048ba6..917a1d6b09 100644 --- a/editors/code/src/toolchain.ts +++ b/editors/code/src/toolchain.ts @@ -211,4 +211,4 @@ async function isFileAtUri(uri: vscode.Uri): Promise<boolean> { } catch { return false; } -}
\ No newline at end of file +} |