⬆️ rust-analyzer #108260

lnicola · 2023-02-20T08:14:44Z

Discard postfix completion if the next_non_trivia_sibling of dot_token is an ELSE_KW.

Looks like this is a native encoding for Emacs at least!

minor: sync from downstream

…indivisble-expr, r=Veykril fix: Don't trigger postfix completion in `if` block which has an `else` block Fix rust-lang#14096

…verflow, r=Veykril fix: Don't expand macros in the same expansion tree after overflow This patch fixes 2 bugs: - In `Expander::enter_expand_id()` (and in code paths it's called), we never check whether we've reached the recursion limit. Although it hasn't been reported as far as I'm aware, this may cause hangs or stack overflows if some malformed attribute macro is used on associated items. - We keep expansion even when recursion limit is reached. Take the following for example: ```rust macro_rules! foo { () => {{ foo!(); foo!(); }} } fn main() { foo!(); } ``` We keep expanding the first `foo!()` in each expansion and would reach the limit at some point, *after which* we would try expanding the second `foo!()` in each expansion until it hits the limit again. This will (by default) lead to ~2^128 expansions. This is essentially what's happening in rust-lang#14074. Unlike rustc, we don't just stop expanding macros when we fail as long as it produces some tokens so that we can provide completions and other services in incomplete macro calls. This patch provides a method that takes care of recursion depths (`Expander::within_limit()`) and stops macro expansions in the whole macro expansion tree once it detects recursion depth overflow. To be honest, I'm not really satisfied with this fix because it can still be used in unintended ways to bypass overflow checks, and I'm still seeking ways such that misuses are caught by the compiler by leveraging types or something. Fixes rust-lang#14074

Co-authored-by: Stig Brautaset <stig@brautaset.org>

Support UTF-32 position encoding Looks like this is a native encoding for Emacs at least!

…, r=Veykril fix: Search raw identifiers without prefix When we find references/usages of a raw identifier, we should disregard `r#` prefix because there are keywords one can use without the prefix in earlier editions (see rust-lang#13034; this bug is actually fallout from the PR). `name`, the text we're searching for, has already been stripped of the prefix, but the text of nodes we compare it to hasn't been. The second commit is strictly refactoring, I can remove it if it's not much of value.

internal: Improve parser recovery for delimited lists Closes rust-lang/rust-analyzer#11188, rust-lang/rust-analyzer#10410, rust-lang/rust-analyzer#10173 Should probably be merged after the stable release as this might get the parser stuck if I missed something

Don't assume VSCode internal commands in the server

Bump lsp-types

…nly of `None` args

internal: Don't allocate the generic_args vec in `hir_def::Path` if it consists only of `None` args Saves roughly 5mb on self

internal: Make CompletionItem more POD-like

fix link Fixes rust-lang/rust-analyzer#14170

rustbot · 2023-02-20T08:14:48Z

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/wg-rls-2

lnicola · 2023-02-20T08:20:18Z

@fasterthanlime umm, bit of help here please, do you know why this PR (as produced by git subtree pull) contains older commits? The last one was #107992, followed by a merge to upstream in rust-lang/rust-analyzer#14143.

fasterthanlime · 2023-02-20T09:50:33Z

@fasterthanlime umm, bit of help here please, do you know why this PR (as produced by git subtree pull) contains older commits? The last one was #107992, followed by a merge to upstream in rust-lang/rust-analyzer#14143.

Off the top of my head (and from my phone) I'm not sure. That one is the only older commit (Jan 11), right? 3e0e51c - Everything else is from a month later at least, afaict.

It corresponds to rust-lang/rust-analyzer@3e0e51c in RA, which seems to have been introduced with rust-lang/rust-analyzer#14143 — I'm not sure how it ended up there, but it seems git-subtree is doing the right thing?

edit: I'm still confused after checking it out a little more (still on mobile). That commit is already in rust as 40ba0e8 - @eddyb is it possible that's the one commit we messed up when manually making the mega-sync?

fasterthanlime · 2023-02-20T14:54:17Z

@lnicola so I can't really explain what happened there unfortunately. However, I'm curious: if you do another rust->ra sync after this PR (you can pretend to do that without actually merging the PR through bors/GitHub's UI), does the next ra->rust sync also still contain this commit?

lnicola · 2023-02-20T15:40:55Z

This is how I tested:

# in the RA repo
$ git branch -D sync-from-rust

# in the Rust repo
$ git checkout rust-analyzer-2023-02-20
$ git subtree push -P src/tools/rust-analyzer rust-analyzer-local sync-from-rust
$ git checkout -b ra-new-sync
$ git subtree pull -P src/tools/rust-analyzer rust-analyzer-local sync-from-rust
$ git log --format=oneline
04c4eda971e945fa533880eb14fc6db314d8ed3e (HEAD -> ra-new-sync) Merge commit '7e711da2f07778d62f6411de5da520f1e260d761' into ra-new-sync
03288ebba35defc807952e6e55a0ab8f5f77aa83 (origin/rust-analyzer-2023-02-20, rust-analyzer-2023-02-20) :arrow_up: rust-analyzer
7e711da2f07778d62f6411de5da520f1e260d761 (rust-analyzer-local/sync-from-rust) :arrow_up: rust-analyzer
824f915cbc32c0942122389274a1b6fbe2ffc51e (upstream/master, upstream/HEAD, master) Auto merge of #108235 - tmiasko:read-buf, r=the8472
[snip]

fasterthanlime · 2023-02-20T15:52:47Z

This is how I tested:

Okay well, it doesn't seem to show up again.

Here's what I don't understand about the current situation:

There's a commit with the same hash in both RA and this PR: having "the same commit" show up is by design, but they should affect different paths, and thus have different hashes
Said commit in that PR does not touch src/tools/rust-analyzer/crates, it touches crates directly, you can tell by looking at this PR's commit

These paths don't show up in the Files changed tab of the PR, so I'm really not sure what's going on.

lnicola · 2023-02-20T17:11:07Z

Given that my test above went fine, should we merge it like this?

fasterthanlime · 2023-02-20T17:44:33Z

Given that my test above went fine, should we merge it like this?

The test working makes me slightly more confident in this, ideally I'd love to have an extra pair of eyes on this, I've pinged a couple folks and will keep you posted

fasterthanlime · 2023-02-20T18:21:02Z

The test working makes me slightly more confident in this, ideally I'd love to have an extra pair of eyes on this, I've pinged a couple folks and will keep you posted

I haven't heard back yet and don't want to block this, you got my 👍

workingjubilee · 2023-02-20T18:25:47Z

Based on my subtree experiences, I think it's fine. Sometimes a commit gets confusingly replayed on the other side of the subtree so git can't quite be sure if it's new or not. If it's only one in a hundred commits or so, it's annoying but not unexpected.

lnicola · 2023-02-20T18:50:06Z

@bors r+ p=1

bors · 2023-02-20T18:50:08Z

📌 Commit 03288eb has been approved by lnicola

It is now in the queue for this repository.

bors · 2023-02-20T19:04:55Z

⌛ Testing commit 03288eb with merge 5243ea5...

bors · 2023-02-20T22:01:40Z

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 5243ea5 to master...

rust-timer · 2023-02-20T23:08:27Z

Finished benchmarking commit (5243ea5): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.2%	[-3.5%, -2.8%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.2%	[-3.5%, -2.8%]	2

Cycles

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

albertlarsan68 and others added 30 commits January 11, 2023 09:32

Change src/test to tests in source files, fix tidy and tests

3e0e51c

Don't expand macros in the same expansion tree after overflow

ae7e62c

Don't trigger postfix completion if block which has an else block

e1396bd

Discard postfix completion if the next_non_trivia_sibling of dot_token is an ELSE_KW.

internal: Improve parser recovery a bunch

1be24e0

Fix active parameter analysis

33cacde

Make else autocompletion work in more places

d2cf8c2

Fix active parameter analysis once more

9738f97

Cleanup signature help a bit

244a48d

Find next_non_trivia_token of name_ref.

0285acc

⬆️ rust-analyzer

bc45c76

Support UTF-32 position encoding

0da2737

Looks like this is a native encoding for Emacs at least!

Merge branch 'master' into sync-from-rust

354b1aa

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

a33e9d9

minor: sync from downstream

Auto merge of rust-lang#14123 - dqkqd:discard-postfix-completion-for-…

3812951

…indivisble-expr, r=Veykril fix: Don't trigger postfix completion in `if` block which has an `else` block Fix rust-lang#14096

Update crates/ide-db/src/line_index.rs

9fdcf57

Co-authored-by: Stig Brautaset <stig@brautaset.org>

Search raw identifiers without prefix

098d9d7

refactor: reduce nesting

60fa8fe

Auto merge of rust-lang#14141 - matklad:utf-32, r=lnicola

31486a6

Support UTF-32 position encoding Looks like this is a native encoding for Emacs at least!

Recover better for more delimited sequences

4f6b5f4

Don't assume VSCode internal commands in the server

95fa278

Bump lsp-types

38144fd

Auto merge of rust-lang#14147 - Veykril:completion, r=Veykril

2e86029

Don't assume VSCode internal commands in the server

Auto merge of rust-lang#14148 - Veykril:lsp-types, r=Veykril

e7bc68f

Bump lsp-types

internal: Enable smallvec's union feature

3c0f20a

Don't allocate the generic_args vec in hir_def::Path if it consists o…

a18ebf4

…nly of `None` args

Auto merge of rust-lang#14150 - Veykril:path, r=Veykril

9548388

internal: Don't allocate the generic_args vec in `hir_def::Path` if it consists only of `None` args Saves roughly 5mb on self

Trigger call info for more completions of signature having things

cade9f7

Veykril and others added 5 commits February 16, 2023 09:29

internal: Make CompletionItem more POD-like

404a51f

Auto merge of rust-lang#14165 - Veykril:completion-item, r=Veykril

b881deb

internal: Make CompletionItem more POD-like

fix link

936bac3

Auto merge of rust-lang#14171 - Ethan-000:master, r=matklad

a6603fc

fix link Fixes rust-lang/rust-analyzer#14170

⬆️ rust-analyzer

03288eb

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

lnicola marked this pull request as draft February 20, 2023 08:16

lnicola marked this pull request as ready for review February 20, 2023 18:49

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 Feb 20, 2023

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

bors merged commit 5243ea5 into rust-lang:master Feb 20, 2023

rustbot added this to the 1.69.0 milestone Feb 20, 2023

lnicola deleted the rust-analyzer-2023-02-20 branch February 20, 2023 22:09

matthiaskrgr mentioned this pull request Nov 17, 2023

ICE: cycle detected when computing function signature of #110106

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

⬆️ rust-analyzer #108260

⬆️ rust-analyzer #108260

lnicola commented Feb 20, 2023

rustbot commented Feb 20, 2023

lnicola commented Feb 20, 2023 •

edited

Loading

fasterthanlime commented Feb 20, 2023 •

edited

Loading

fasterthanlime commented Feb 20, 2023

lnicola commented Feb 20, 2023

fasterthanlime commented Feb 20, 2023

lnicola commented Feb 20, 2023

fasterthanlime commented Feb 20, 2023

fasterthanlime commented Feb 20, 2023

workingjubilee commented Feb 20, 2023

lnicola commented Feb 20, 2023

bors commented Feb 20, 2023

bors commented Feb 20, 2023

bors commented Feb 20, 2023

rust-timer commented Feb 20, 2023

⬆️ rust-analyzer #108260

⬆️ rust-analyzer #108260

Conversation

lnicola commented Feb 20, 2023

rustbot commented Feb 20, 2023

lnicola commented Feb 20, 2023 • edited Loading

fasterthanlime commented Feb 20, 2023 • edited Loading

fasterthanlime commented Feb 20, 2023

lnicola commented Feb 20, 2023

fasterthanlime commented Feb 20, 2023

lnicola commented Feb 20, 2023

fasterthanlime commented Feb 20, 2023

fasterthanlime commented Feb 20, 2023

workingjubilee commented Feb 20, 2023

lnicola commented Feb 20, 2023

bors commented Feb 20, 2023

bors commented Feb 20, 2023

bors commented Feb 20, 2023

rust-timer commented Feb 20, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

lnicola commented Feb 20, 2023 •

edited

Loading

fasterthanlime commented Feb 20, 2023 •

edited

Loading