Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ rust-analyzer #100049

Merged
merged 43 commits into from
Aug 3, 2022
Merged

⬆️ rust-analyzer #100049

merged 43 commits into from
Aug 3, 2022

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Aug 2, 2022

r? @ghost

zachs18 and others added 30 commits July 25, 2022 15:45
…lnicola

Find standalone proc-macro-srv on windows too

I forgot that executables end with `.exe` on Windows in:

  * rust-lang/rust-analyzer#12858
fix: Fix server panicking on project loading when proc-macros are disabled

Fixes rust-lang/rust-analyzer#12879
fix: Insert spaces when inlining a function defined in a macro.

(partially) fixes rust-lang#12860.

This PR (only) addresses the whitespace issue when inlining functions defined in macros.

Additionally, the indentation/spacing is not ideal, but works, e.g.
```rs
macro_rules! define_function {
    () => { fn test_function_macro() {
        if let Some(3) = 3i32.checked_add(0) {
            println!("3 + 0 == 3");
        }
    } };
}
define_function!();
fn main() {
    test_function_macro();
}
// previously became
// ...
fn main() {
    ifletSome(3)=3i32.checked_add(0){println!("3 + 0 == 3");};
}
// now becomes
// ...
fn main() {
    if let Some(3) = 3i32.checked_add(0){
        println!("3 + 0 == 3");

      };
}
```

The `self` -> `this` problem[^this] is (probably?) a separate problem that I am also looking into.

[^this]: As mentioned in [my comment on the above issue](rust-lang/rust-analyzer#12860 (comment)), inlining a method defined in a macro does not properly replace `self` with the new local `this`.
fix: Fix Semantics::original_ast_node not caching the resulting file
fix: Honor ref expressions for compute_ref_match completions

Fixes rust-lang/rust-analyzer#8357
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
…x, r=Veykril

Find original ast node before compute ref match

ref rust-lang/rust-analyzer#12717
internal: Assume condition/iterable is missing if there is only a BlockExpr

cc rust-lang/rust-analyzer#12880 (comment)

It sounds good on paper, so let's try it
Use large stack on expander thread

I have verified that this fixes rust-lang#12884 for me.

Hat tip to `@bjorn3` for identifying the cause of the issue.
fix: Fix pattern completions adding unnecessary braces

Fixes rust-lang/rust-analyzer#12852
fix: Do completions in path qualifier position

Fixes rust-lang/rust-analyzer#12566

Not too happy with the duplication needed for this, but it is what it is. Completions in path qualifiers will have to be filtered properly still, but its better to show too many completions for this than too few for now.
publish: Use cargo ws rename to rename crates

Follow up for rust-lang#12716
fix: Order ItemScope::entries results
bors and others added 13 commits July 28, 2022 18:08
Only run rainbow highlighting test on 64-bit Unix
…lnicola

internal: Be more explicit when filtering built-in completions

We return every built-in type here, but only have `u32` in the tests, so let's look for that one to make tests more reliable across platforms.
fix: complete path of existing record expr
minor: Properly cfg the `max` field of Limit
internal: Update `xtask promote` and release instructions

Update `xtask` for the subtree workflow. This doesn't explain how to do a `rust -> RA`  sync, since that's definitely more involved, but will probably only happen rarely.
@lnicola lnicola force-pushed the rust-analyzer-2022-08-02 branch from 3b9bf05 to 30a3706 Compare August 2, 2022 06:05
@lnicola
Copy link
Member Author

lnicola commented Aug 2, 2022

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Aug 2, 2022

📌 Commit 30a3706 has been approved by lnicola

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 2, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#99933 (parallelize HTML checking tool)
 - rust-lang#99958 (Improve position named arguments lint underline and formatting names)
 - rust-lang#100008 (Update all pre-cloned submodules on startup)
 - rust-lang#100049 (:arrow_up: rust-analyzer)
 - rust-lang#100070 (Clarify Cargo.toml comments)
 - rust-lang#100074 (rustc-docs: Be less specific about the representation of `+bundle`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a15500c into rust-lang:master Aug 3, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 3, 2022
@lnicola lnicola deleted the rust-analyzer-2022-08-02 branch August 3, 2022 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants