⬆️ rust-analyzer #109377

lnicola · 2023-03-20T06:31:57Z

…or reborrows

…lnicola ⬆️ `rust-analyzer` r? `@ghost`

This feature requires the user to add a command that generates a `rust-project.json` from a set of files. Project discovery can be invoked in two ways: 1. At extension activation time, which includes the generated `rust-project.json` as part of the linkedProjects argument in InitializeParams 2. Through a new command titled "Add current file to workspace", which makes use of a new, rust-analyzer specific LSP request that adds the workspace without erasing any existing workspaces. I think that the command-running functionality _could_ merit being placed into its own extension (and expose it via extension contribution points), if only provide build-system idiomatic progress reporting and status handling, but I haven't (yet) made an extension that does this.

Co-authored-by: Lukas Wirth <[email protected]>

…to avoid failing tests

…iguration has changed

minor: Sync from downstream

…-source-to-status, r=lnicola Add path of workspace root folders to status output Hi folks! Just a quick addition to the status output. There are some colleagues of mine who use a mix of Buck and Cargo. A person spent a bit of time this past week trying to figure out there the `rust-project.json` was coming from and pointed out that `rust-analyzer: Status` could be a good place to put this information. rust-analyzer doesn't seem to record the full path of the `Cargo.toml` or the `rust-project.json`, just the root directory. While not perfect, this should be enough for people to unblock themselves on. Here's an example of `rust-analyzer: Status` on the rust-analyzer repo: ``` Workspaces: Loaded 192 packages across 1 workspace. Workspace roots: [AbsPath("/Users/dbarsky/Developer/rust-analyzer")] Analysis: 57mb of files 0b of index symbols (0) 2514 trees, 128 preserved 29535 trees, 128 preserved (Macros) 0b in total File info: Crate: rust_analyzer(CrateId(131)) Dependencies: proc_macro=CrateId(5), core=CrateId(2), alloc=CrateId(0), std=CrateId(7), test=CrateId(9), always_assert=CrateId(12), anyhow=CrateId(13), cfg=CrateId(25), crossbeam_channel=CrateId(35), dissimilar=CrateId(41), expect_test=CrateId(46), flycheck=CrateId(50), hir=CrateId(56), hir_def=CrateId(57), hir_ty=CrateId(59), ide=CrateId(63), ide_db=CrateId(66), ide_ssr=CrateId(68), itertools=CrateId(73), jod_thread=CrateId(75), lsp_server=CrateId(83), lsp_types=CrateId(85), mbe=CrateId(87), num_cpus=CrateId(96), oorandom=CrateId(99), parking_lot=CrateId(102), proc_macro_api=CrateId(110), proc_macro_srv=CrateId(111), profile=CrateId(118), project_model=CrateId(119), rayon=CrateId(125), rustc_hash=CrateId(136), scip=CrateId(141), serde=CrateId(145), serde_json=CrateId(147), sourcegen=CrateId(153), stdx=CrateId(155), syntax=CrateId(158), test_utils=CrateId(159), threadpool=CrateId(165), toolchain=CrateId(170), tracing=CrateId(171), tracing_log=CrateId(174), tracing_subscriber=CrateId(175), tracing_tree=CrateId(176), tt=CrateId(177), vfs=CrateId(188), vfs_notify=CrateId(189), xflags=CrateId(192), xshell=CrateId(194) ```

feat: add `is_float` & `is_char` to `hir::Type` Some useful functions we didn't have on `Type` (were present on `BuiltinType`). Also, I am considering exposing `TyKind` with `get_kind`, let me know if that's a better idea than implementing these API extensions incrementally.

internal: Allow the status bar item to be clicked again And give that the most useful action for the given state.

fix: Do not retry inlay hint requests Should close rust-lang/rust-analyzer#13372, retrying the way its currently implemented is not ideal as we do not adjust offsets in the requests, but doing that is a major PITA, so this should at least work around one of the more annoying issues stemming from it.

(rebased onto 6dfd8ae)

internal: Prioritize remove-dbg assist over inline-macro

fix: Fix return type of async closures. May fix rust-lang#12957

fix: Fix `ast::IfExpr` child accessors Fixes rust-lang/rust-analyzer#14360

feat: show only missing variant suggestion for enums in patterns completion and bump them in list too Fixes rust-lang#12438 ### Points to help in review: - This PR can be reviewed commit wise, first commit is about bumping enum variant completions up in the list of completions and second commit is about only showing enum variants which are not complete - I am calculating missing variants in analysis.rs by firstly locating the enum and then comparing each of it's variant's name and checking if arm string already contains that name, this is kinda hacky but I didn't want to implement complete missing_arms assist here as that would have been too bulky to run on each completion cycle ( if we can improve this somehow would appreciate some inputs on it ) ### Output: https://user-images.githubusercontent.com/49019259/208245540-57d7321b-b275-477e-bef0-b3a1ff8b7040.mov Relevant Zulip Discussion: https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/Issue.20.2312438

so that we can catch regressions when we move away from chalk.

internal: Bump chalk This release fixes a problem around GATs (rust-lang/chalk#790). While a regression test is added in chalk's own test suite, I also added one in ours so that we can catch regressions when we move away from chalk. Fixes rust-lang#14164

rustbot · 2023-03-20T06:32:02Z

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/rust-analyzer

lnicola · 2023-03-20T06:32:50Z

@bors r+ p=1

bors · 2023-03-20T06:32:52Z

📌 Commit 0f499b4 has been approved by lnicola

It is now in the queue for this repository.

bors · 2023-03-20T08:44:09Z

⌛ Testing commit 0f499b4 with merge 356c651...

bors · 2023-03-20T11:18:42Z

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 356c651 to master...

rust-timer · 2023-03-20T14:06:44Z

Finished benchmarking commit (356c651): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.3%	[1.2%, 1.4%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.0%	[-3.3%, -0.5%]	5
Improvements ✅ (secondary)	-2.6%	[-3.8%, -1.0%]	46
All ❌✅ (primary)	-1.1%	[-3.3%, 1.4%]	7

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.5%, 0.5%]	1

feniljain and others added 30 commits December 17, 2022 19:21

feat: bump variant suggestion for enums in patterns completion

68fd1ce

feat: filter already present enum variants in match arms

794988c

Remove uses of box_syntax in rustc and tools

c6da2f9

⬆️ rust-analyzer

b2f6fd4

feat: add is_float & is_char to hir::Type

fe82649

feat: add remove_slice to hir::Type

34e3ea8

Allow the status bar item to be clicked again

cf95322

fix: as suggested change remove_slice to as_slice

cfbdf62

fix: Only skip adjustment hints for block, if and match expressions f…

228b44c

…or reborrows

internal: Rename AstDatabase to ExpandDatabase

9fb9ee3

Shrink ProcMacroExpander size

aaf08bd

Auto merge of rust-lang#109069 - lnicola:rust-analyzer-2023-03-13, r=…

544b4cf

…lnicola ⬆️ `rust-analyzer` r? `@ghost`

fmt

46e0220

remove errant -- in executeDiscoverProject

1f5c535

fix typo in package.json.

68d3eae

Update crates/rust-analyzer/src/handlers.rs

7a6e111

Co-authored-by: Lukas Wirth <[email protected]>

move rust-analyzer.discoverProjectCommand above $generated-start …

9137149

…to avoid failing tests

Add a workspace config-based approach to reloading discovered projects.

8d9bff0

Remove rust-analyzer/addProject in favor of notifying r-a that conf…

56273b3

…iguration has changed

fmt

cb93c12

Add path of workspace root folders to status output

677c0ee

rename "addProject" command

78aed30

fix: use compute_type_match correctly and update tests accordingly

a10372d

Merge branch 'master' into sync-from-rust

3b6db22

Auto merge of rust-lang#14345 - lnicola:sync-from-rust, r=lnicola

ce4f79f

minor: Sync from downstream

Auto merge of rust-lang#14337 - Veykril:vscode-status, r=lnicola

4cbb940

internal: Allow the status bar item to be clicked again And give that the most useful action for the given state.

Add storage dead for let bindings without initializer

d7da9e6

bors and others added 17 commits March 15, 2023 11:44

fix: Fix return type of async closures.

6746a08

(rebased onto 6dfd8ae)

Add test for async closure types.

af175dd

(rebased onto 6dfd8ae)

Simplify

3bf07a5

internal: Prioritize remove-dbg assist over inline-macro

802d7ea

Auto merge of rust-lang#14362 - Veykril:remove-dbg, r=Veykril

c16f051

internal: Prioritize remove-dbg assist over inline-macro

fix: Fix ast::IfExpr child accessors

9fe2069

Auto merge of rust-lang#12958 - zachs18:async_closure, r=Veykril

8330f8e

fix: Fix return type of async closures. May fix rust-lang#12957

Auto merge of rust-lang#14361 - Veykril:if-then-parse, r=Veykril

924d277

fix: Fix `ast::IfExpr` child accessors Fixes rust-lang/rust-analyzer#14360

feat: do not remove other variants, just push them down in list

6778d1a

fix: make tests valid rust code

f711368

refactor: pass is_variant_missing as args to build_completion

a79a76a

Bump chalk to 0.89

1d1a86f

Add regression test

e12460b

so that we can catch regressions when we move away from chalk.

⬆️ rust-analyzer

0f499b4

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 20, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 20, 2023

bors merged commit 356c651 into rust-lang:master Mar 20, 2023

rustbot added this to the 1.70.0 milestone Mar 20, 2023

lnicola deleted the rust-analyzer-2023-03-20 branch March 20, 2023 11:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

⬆️ rust-analyzer #109377

⬆️ rust-analyzer #109377

lnicola commented Mar 20, 2023

rustbot commented Mar 20, 2023

lnicola commented Mar 20, 2023

bors commented Mar 20, 2023

bors commented Mar 20, 2023

bors commented Mar 20, 2023

rust-timer commented Mar 20, 2023

⬆️ rust-analyzer #109377

⬆️ rust-analyzer #109377

Conversation

lnicola commented Mar 20, 2023

rustbot commented Mar 20, 2023

lnicola commented Mar 20, 2023

bors commented Mar 20, 2023

bors commented Mar 20, 2023

bors commented Mar 20, 2023

rust-timer commented Mar 20, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles