Convert rust-analyzer to an in-tree tool #99603

fix: typos in hir-ty

…Veykril fix: complete enum variants as patterns in pattern path close rust-lang#12593

fix regressions on assignment expressions This is a follow-up PR on rust-lang#12428. I'm not sure if this is everything I overlooked, so if there are more things that are not right, we may want to revert rust-lang#12428. This should also fix the increase of the type mismatches and the unknown types in diesel in the [metrics](https://rust-analyzer.github.io/metrics/?start=2022-06-23&end=2022-07-01) introduced by rust-lang#12428. The regressions are: - some coercions don't work in the ordinary (i.e. non-destructuring) assignments In order for coercions on ADT fields instantiations to work, lhs type has to be known before inferring rhs. rust-lang#12428 changed the inference order, making rhs inferred before lhs, breaking the coercion, so I restored the original inference mechanism for the ordinary assignments. Note that this kind of coercion doesn't happen in destructuring assigments, because when they are desugared, the struct expression is first assigned to a temporary, which is then assigned to the assignee, which is not coercion site anymore. - type mismatches on individual identifiers are not reported

This change fixes issue rust-lang#10037, in more or less the most naive fashion possible. We continue to start with the hardcoded default of "fun_name", and now append a counter to the end of it if that name is already in scope. In the future, we can probably apply more heuristics here to wind up with more useful names by default, but for now this resolves the immediate problem.

…on-duplicate-name, r=DorianListens fix: Extract Function produces duplicate fn names This change fixes rust-lang#10037, in more or less the most naive fashion possible. We continue to start with the hardcoded default of "fun_name", and now append a counter to the end of it if that name is already in scope. In the future, we can probably apply more heuristics here to wind up with more useful names by default, but for now this resolves the immediate problem.

This change fixes rust-lang#10036, "Extract to function assist implements nonexistent trait methods". When we detect that the extraction is coming from within a trait impl, and that a `self` param will be necessary, we adjust which `SyntaxNode` to `insert_after`, and create a new empty `impl` block for the newly extracted function.

Bump deps

…overrideCommand

Improve documentation for `buildScripts.overrideCommand` / `checkOnSave.overrideCommand`

internal: Update inert attribute list

Signed-off-by: hi-rustin <[email protected]>

Fix tidy check does not work for marks in multiline

…schievink Remove useless bors.toml It seems we do not use bors-ng anymore. So maybe this is useless.

Signed-off-by: hi-rustin <[email protected]>

internal: use different schemes for the custom views Related to rust-lang#12699, but doesn't fix it because we still register the providers multiple times.

Add more test cases for generic args

…chievink internal: Use `SmallVec` to slightly shrink `ModPath` size Saves like a megabyte on r-a itself.

Complete type param/associated type in trait generic arg per arg index - Fix rust-lang#12140 - Also fix tidy check does not work for marks in multiline

Attempting to publish for example ra_ap_text-edit when ra_ap_text_edit has already been published is rejected by crates.io.

…s, r=lnicola publish workflow: Fix names for existing crates Attempting to publish for example ra_ap_text-edit when ra_ap_text_edit has already been published is rejected by crates.io.

…schievink internal: Update remaining GitHub URLs The old links still work, but it seems less confusing to have them point to the right repo

…ait-impl, r=jonas-schievink fix: Extract function from trait impl This change fixes rust-lang#10036, "Extract to function assist implements nonexistent trait methods". When we detect that the extraction is coming from within a trait impl, and that a `self` param will be necessary, we adjust which `SyntaxNode` to `insert_after`, and create a new empty `impl` block for the newly extracted function.

… r=jonas-schievink Remove unnecessary unsafe from format_args expansion

This change fixes rust-lang#12705. In `FunctionBody::analyze`, we need to search any `ClosureExpr`s we encounter for any `NameRef`s, to ensure they aren't missed.

…r=DorianListens fix: Extract Function misses locals used in closures This change fixes rust-lang#12705. In `FunctionBody::analyze`, we need to search any `ClosureExpr`s we encounter for any `NameRef`s, to ensure they aren't missed.

When extracting a field expression, if RA was unable to resolve the type of the field, we would previously fall back to using "var_name" as the variable name. Now, when the `Expr` being extracted matches a `FieldExpr`, we can use the `NameRef`'s ident token as a fallback option. fixes rust-lang#10035

Signed-off-by: hi-rustin <[email protected]>

…eld-name, r=jonas-schievink fix: Improve suggested names for extracted variables When extracting a field expression, if RA was unable to resolve the type of the field, we would previously fall back to using "var_name" as the variable name. Now, when the `Expr` being extracted matches a `FieldExpr`, we can use the `NameRef`'s ident token as a fallback option. fixes rust-lang#10035

Bump npm deps

This only fixes the comments in the internal source, which is not mandatory at all

Signed-off-by: hi-rustin <[email protected]>

Fix typos Signed-off-by: hi-rustin <[email protected]>

…s-schievink feat: Implement `ignore` and `index` metavar expression Part of rust-lang/rust-analyzer#11952 Fixes rust-lang/rust-analyzer#12675

…r=jonas-schievink fix: Update 1.63 proc macro ABI to match rustc This updates us to the ABI used by rustc 1.63.0-beta.5, which will likely be the ABI of the next stable Rust release. It should also work on nightly (for now, but future changes won't be supported until the rustc version is bumped). cc rust-lang/rust-analyzer#12600

…-keys, r=Veykril Fix obsolete config keys The config keys were drastically reorganized by rust-lang#12010, but the docs don't reflect the updates, causing inconsistency and confusion. I checked for such obsolete configuration keys and updated to the new one. For reproducibility, I attach a small shell script that I used to examine the old keys. Now the script only detects `cargoExtraArgs` and `overrideCargo`, which originates from other type definition in the code but not from the configuration. <details><summary>script</summary> ```bash echo "allowMergingIntoGlobImports exprFillDefault importEnforceGranularity importGranularity importMergeBehavior importMergeBehaviour importGroup importPrefix warmup loadOutDirsFromCheck runBuildScripts runBuildScriptsCommand useRustcWrapperForBuildScripts enableExperimental procAttrMacros breakPoints exitPoints yieldPoints linksInHover linksInHover gotoTypeDef chainingHints closureReturnTypeHints hideNamedConstructorHints parameterHints reborrowHints typeHints lruCapacity cargoExtraArgs overrideCargo rustcSource enableRangeFormatting assist\.allowMergingIntoGlobImports assist\.exprFillDefault assist\.importEnforceGranularity assist\.importGranularity assist\.importMergeBehavior assist\.importMergeBehaviour assist\.importGroup assist\.importPrefix primeCaches\.enable cache\.warmup cargo\.loadOutDirsFromCheck cargo\.runBuildScripts cargo\.runBuildScriptsCommand cargo\.useRustcWrapperForBuildScripts completion\.snippets diagnostics\.enableExperimental experimental\.procAttrMacros highlighting\.strings highlightRelated\.breakPoints highlightRelated\.exitPoints highlightRelated\.yieldPoints highlightRelated\.references hover\.documentation hover\.linksInHover hoverActions\.linksInHover hoverActions\.debug hoverActions\.enable hoverActions\.gotoTypeDef hoverActions\.implementations hoverActions\.references hoverActions\.run inlayHints\.chainingHints inlayHints\.closureReturnTypeHints inlayHints\.hideNamedConstructorHints inlayHints\.parameterHints inlayHints\.reborrowHints inlayHints\.typeHints lruCapacity runnables\.cargoExtraArgs runnables\.overrideCargo rustcSource rustfmt\.enableRangeFormatting allFeatures addCallArgumentSnippets addCallParenthesis callInfo\.full cargo\.allFeatures checkOnSave\.allFeatures completion\.addCallArgumentSnippets completion\.addCallParenthesis" | while read -r pattern do rg '\b'$pattern'\b([^.]|$)' . -g "!crates/rust-analyzer/src/config/patch_old_style.rs" -g "!editors/code/src/config.ts" -g "!a.sh" --no-heading --color=always --line-number done exit excluded # debug # enable # run # implementations # references # documentation # references # snippets # strings # full ``` </details>

Add str_ref_to_string fix close rust-lang/rust-analyzer#11383 When type mismatch is `&str` -> `String` try to fix it.

fix: Fix VSCode status bar tooltip not showing the error messages

fix: Set server binary version when distributing

This change attempts to resolve issue rust-lang#7636: Extract into Function does not create a generic function with constraints when extracting generic code. In `FunctionBody::analyze_container`, we now traverse the `ancestors` in search of `AnyHasGenericParams`, and attach any `GenericParamList`s and `WhereClause`s we find to the `ContainerInfo`. Later, in `format_function`, we collect all the `GenericParam`s and `WherePred`s from the container, and filter them to keep only types matching `TypeParam`s used within the newly extracted function body or param list. We can then include the new `GenericParamList` and `WhereClause` in the new function definition. This change only impacts `TypeParam`s. `LifetimeParam`s and `ConstParam`s are out of scope for this change.

aware

fix(completion): `super::` completion at crate root and module depth aware - should close rust-lang#12439 - Suggest super according to the depth in tree

fix: Fix unresolved proc macro diagnostics pointing to macro expansions Fixes rust-lang/rust-analyzer#12657

…t, r=Veykril fix: Support generics in extract_function assist This change attempts to resolve issue rust-lang#7636: Extract into Function does not create a generic function with constraints when extracting generic code. In `FunctionBody::analyze_container`, we now traverse the `ancestors` in search of `AnyHasGenericParams`, and attach any `GenericParamList`s and `WhereClause`s we find to the `ContainerInfo`. Later, in `format_function`, we collect all the `GenericParam`s and `WherePred`s from the container, and filter them to keep only types matching `TypeParam`s used within the newly extracted function body or param list. We can then include the new `GenericParamList` and `WhereClause` in the new function definition. This change only impacts `TypeParam`s. `LifetimeParam`s and `ConstParam`s are out of scope for this change. I've never contributed to this project before, but I did try to follow the style guide. I believe that this change represents an improvement over the status quo, but I think it's also fair to argue that it doesn't fully "fix" the linked issue. I'm totally open to merging this as is, or going further to try to make a more complete solution. Also: if there are other unit or integration tests I should add, please let me know where to look!

fix: Fix imports being inserted before doc comments in inline modules Fixes rust-lang/rust-analyzer#12758

https://old.reddit.com/r/rust/comments/vyx4oj/actionsrs_organization_became_unmaintained/ Looking at this holistically, I don't fully understand *why* we need an action here? Seems like we can just use rustup? nowadays github runners come with rustup pre-installed.

Co-authored-by: Laurențiu Nicola <[email protected]>

https://old.reddit.com/r/rust/comments/vyx4oj/actionsrs_organization_became_unmaintained/ Looking at this holistically, I don't fully understand *why* we need an action here? Seems like we can just use rustup? nowadays github runners come with rustup pre-installed.

Remove deprecate action https://old.reddit.com/r/rust/comments/vyx4oj/actionsrs_organization_became_unmaintained/ Looking at this holistically, I don't fully understand *why* we need an action here? Seems like we can just use rustup? nowadays github runners come with rustup pre-installed.

…ttribute

fix: Don't show qualified path completions for private items Fixes rust-lang/rust-analyzer#12703

internal: Remove allocation in DefCollector::reseed_with_unresolved_attribute

fix: Improve self param completion applicability Fixes rust-lang/rust-analyzer#9522

It seems like it may be related to self-update? Anyways, I think we should be disabling self-update on CI

try fixing spurious CI failures on windows It seems like it may be related to self-update? Anyways, I think we should be disabling self-update on CI

- allow appending tokens after a token, not just a node - allow inserting delimiters (and remove them again) - fix up `if {}` and `if` without anything following

fix: Improve syntax fixup a bit, handle incomplete `if` - allow appending tokens after a token, not just a node - allow inserting delimiters (and remove them again) - fix up `if {}` and `if` without anything following

…ykril fix: ignore renames for crate root close rust-lang#12684 . I just ignore renames for crate root in `rename_mod` func.

…ykril Automatically instaciate trivially instaciable structs in "Generate new" and "Fill struct fields" As proposed in rust-lang#12535 this PR changes the "Generate new" and "Fill struct fields" assist/diagnostic to instanciate structs with no fields and enums with a single empty variant. For example: ```rust pub enum Bar { Bar {}, } struct Foo<T> { a: usize, bar: Bar, _phantom: std::marker::PhantomData<T>, } impl<T> Foo<T> { /* generate new */ fn random() -> Self { Self { /* Fill struct fields */ } } } ``` was previously: ```rust impl<T> Foo<T> { fn new(a: usize, bar: Bar, _phantom: std::marker::PhantomData<T>) -> Self { Self { a, bar, _phantom } } fn random() -> Self { Self { a: todo!(), bar: todo!(), _phantom: todo!(), } } } ``` and is now: ```rust impl<T> Foo<T> { fn new(a: usize) -> Self { Self { a, bar: Bar::Bar {}, _phantom: std::marker::PhantomData } } fn random() -> Self { Self { a: todo!(), bar: Bar::Bar {}, _phantom: std::marker::PhantomData, } } } ``` I'd be happy about any suggestions. ## TODO - [x] deduplicate `use_trivial_constructor` (unclear how to do as it's used in two separate crates) - [x] write tests Closes rust-lang#12535

internal: Record all macro definitions in ItemScope Fixes rust-lang/rust-analyzer#12100 Doesn't resolve the shadowing issues though, fixing those is gonna be really tricky I believe unless we can come up with a nice scheme to "order" item tree items (using syntax ranges and file ids would be a pain and also a bad idea since that'll require us to potentially reparse files in collection).

* feat: support `bool` & `char` const generics

…lnicola fix: Stack overflows and wrong type inference of associated type shorthands This fixes `generic_predicates_for_param_query` comparing local IDs that belong to different definitions. As the query is used in multiple places this fix affects various r-a features when an associated type shorthand and `impl Trait` involved. Notably inference, goto, completion, hover. Fixes rust-lang#12484

…t-generics, r=flodiebold Support negative, `char` & `bool` const generics Before: ![Before](https://user-images.githubusercontent.com/29541480/179379832-0c3b2a74-fef6-427e-b89f-7e31d9c37b3d.png) After: ![After](https://user-images.githubusercontent.com/29541480/179379863-b62475dd-e7bf-41f2-b437-08dfe55951af.png) I tried to implement stuff like `Const<{NUM1 + 3 + NUM2}>` by using already existing constant evaluation mechanism for ordinary constants, but turned out to be harder than I thought, maybe because I've never ever tinkered with compilers before

…t-generics, r=Veykril fix: un-inline `ConstScalarOrPath::from_expr_opt` Sorry, but I missed these from rust-lang#12778 `@flodiebold`

…ykril fix: “Generate constant” ignores the path prefix of the identifier fix rust-lang#12022 add abilities to generate constant with prefix path, even these mods in path are not exist. ## some examples https://user-images.githubusercontent.com/10148927/168710096-59d5c594-0e4a-4ba7-bfb3-21c4b99409ea.mov https://user-images.githubusercontent.com/10148927/168710111-cd6d3df4-58eb-4358-ae9e-791bfc408efa.mov https://user-images.githubusercontent.com/10148927/168710115-601923b7-2164-4b9a-85a9-fbb4b29796a1.mov https://user-images.githubusercontent.com/10148927/168710118-3d4bc9c1-758b-4e6f-9709-568fa920937d.mov

…r=jonas-schievink feat: Support the 1.64 nightly proc macro ABI Should resolve rust-lang/rust-analyzer#12600 Not sure why I thought the Rust version was the same as on beta, that's never the case (but future nightly changes can break the ABI again).

ToString is implemented by many different types than &str, and represents a serialization into string data. The fact that said data is returned as owned, is an implementation detail. If merely copying borrowed string data to owned string data is all that is desired, ToOwned is a much better choice, because if the user later refactors the code such that the input is no longer an `&str`, then they will get a compiler error instead of a mysterious change-in-behavior.

…ievink Fix extract variable assist for subexpression in mutable borrow This checks if the expression is in a mutable borrow and if so makes the extracted variable `mut`. Closes rust-lang#12786

… r=jonas-schievink internal: Remove outdated proc macro ABIs Drops support for 1.48 to 1.57. We still support 1.58+, which is 4 versions out of date, so that should be plenty.

Signed-off-by: hi-rustin <[email protected]>

It's hard to remember to keep this in sync, but since the file path already contains the version, this comment is pretty unnecessary.

…jonas-schievink minor: Remove macro ABI version from doc comment It's hard to remember to keep this in sync, but since the file path already contains the version, this comment is pretty unnecessary.

…Veykril feat: Go to implementation of trait methods try goto where the trait method implies, rust-lang#4558

…kril fix: make file watcher config a drop-down (and clarify the options) Fixes rust-lang/rust-analyzer#12794 Also renames "notify" to "server", since that's clearer ("notify" is still accepted for compatibility).

…tors/code/minimist-1.2.6, r=Veykril Bump minimist from 1.2.5 to 1.2.6 in /editors/code Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/substack/minimist/commit/7efb22a518b53b06f5b02a1038a88bd6290c2846"><code>7efb22a</code></a> 1.2.6</li> <li><a href="https://github.com/substack/minimist/commit/ef88b9325f77b5ee643ccfc97e2ebda577e4c4e2"><code>ef88b93</code></a> security notice for additional prototype pollution issue</li> <li><a href="https://github.com/substack/minimist/commit/c2b981977fa834b223b408cfb860f933c9811e4d"><code>c2b9819</code></a> isConstructorOrProto adapted from PR</li> <li><a href="https://github.com/substack/minimist/commit/bc8ecee43875261f4f17eb20b1243d3ed15e70eb"><code>bc8ecee</code></a> test from prototype pollution PR</li> <li>See full diff in <a href="https://github.com/substack/minimist/compare/1.2.5...1.2.6">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=minimist&package-manager=npm_and_yarn&previous-version=1.2.5&new-version=1.2.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` use these labels` will set the current labels as the default for future PRs for this repo and language - ``@dependabot` use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - ``@dependabot` use these assignees` will set the current assignees as the default for future PRs for this repo and language - ``@dependabot` use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/rust-analyzer/rust-analyzer/network/alerts). </details>

…ykril Add simple support for completion item details Supercedes rust-lang/rust-analyzer#9891 This doesn't yet really implement anything new, it just adds the scaffolding for the protocol conversion

Instead of calling `builder.delete` for every text range we find with `process_usage`, we now ensure that the ranges do not overlap before removing them. If a range is fully contained by a prior one, it is dropped. fixes rust-lang#12784

chore: change str_ref_to_string to str_ref_to_owned `ToString` is implemented by many different types than `&str`, and represents a serialization into string data. The fact that said data is returned as owned, is an implementation detail resulting from the lack of a parameter for a pre-allocated buffer. If merely copying borrowed string data to owned string data is all that is desired, `ToOwned` is a much better choice, because if the user later refactors the code such that the input is no longer an `&str`, then they will get a compiler error instead of a mysterious runtime-behavioral change.

fix: Work around Code bug with empty diagnostics Closes rust-lang#11404

cf. rust-analyzer/expect-test#33 cf. rust-lang#99444 (comment)

As discussed in rust-analyzer/expect-test#33

…nicola Upgrade to [email protected], add CARGO_WORKSPACE_DIR env var This should make ra's test suite runnable from within `rust-analyzer/rust`. `@cuviper` ran into that when trying to run RA tests from rust CI: rust-lang#99444 (comment)

…verlapping, r=DorianListens fix: Prevent panic in Remove Unused Parameter assist Instead of calling `builder.delete` for every text range we find with `process_usage`, we now ensure that the ranges do not overlap before removing them. If a range is fully contained by a prior one, it is dropped. fixes rust-lang#12784

…espace before the appropriate keywords.

…=hi-rustin Find original as node before compute ref match part of rust-lang/rust-analyzer#12717

…=Veykril fix: Correctly generate default `PartialEq::ne` Fixes rust-lang#12779 For the `Generate default members` assist on the `PartialEq` trait, the assist will now give the default implementation instead of generating a function.

fix: Insert `pub(crate)` after doc comments and attribute macros Fixes rust-lang#12790 Original behavior was to insert `pub(crate)` at the `first_child_or_token`, which for an item with a comment or attribute macro, would put the visibility marker before the comment or macro, instead of after. This merge request alters the call to find the node with appropriate `SyntaxKind` in the `children_or_tokens`. It also adds a test case to the module to verify the behavior. Test case verifies function, module, records, enum, impl, trait, and type cases.

fix: escape receiver texts in completion This PR fixes rust-lang#11897 by escaping '\\' and '$' in the text of the receiver position expression. See [here](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#snippet_syntax) for the specification of the snippet syntax (especially [this section](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#grammar) discusses escaping). Although not all occurrences of '\\' and '$' have to be replaced, I chose to replace all as that's simpler and easier to understand. There *are* more clever ways to implement it, but I thought they were premature optimization for the time being (maybe I should put FIXME notes?).

fix: Fix search for associated trait items being inconsistent

…ykril Enable (and fix) extra lint groups required for in-tree build This enables 3 lint groups that are required to build rust-analyzer as an "in-tree" (git subtree) tool in `rust-lang/rust`, and fixes all relevant diagnostics. This change is tracked in: * rust-lang/rust-analyzer#12818 Maintainer impact: more warnings, should be easy enough to fix them (it's mostly looking out for "rust-2015-isms", the lint group is poorly named). If you forget some, they'll show up during a `ra=>rust` sync.

This adds an `in-rust-tree` feature that will be enabled when rust-analyzer is built from `rust-lang/rust`. Due to the way "git subtree" works, that test _will_ find merge commits and fail, so we simply skip it.

… r=Veykril Rename proc macro server from 'Rustc' to 'RustAnalyzer' Related to: * rust-lang/rust-analyzer#12818 This is mostly a courtesy PR for the sake of rustc maintainers. When they looked at `proc-macro-srv`, they noticed the server was named `Rustc` — probably because of historical copy-paste. Only rustc's proc macro server should be named `Rustc`, ra's can be named `RustAnalyzer`. Maintainer impact: There's no semantic changes in this PR, only naming. One test snapshot was updated since "proc macro server types" were used to test traits somewhere else and I renamed those too, why not.

Rationale: Merge commits will probably end up in `rust-lang/rust-analyzer` when doing "rust=>ra" syncs anyway. It could be changed to only check for merge commits in non-sync PRs, but it's "probably not worth the hassle"

Since it's unused for now -it'll be re-introduced along with the upcoming `proc-macro-srv/sysroot` feature.

…r=Veykril Remove `check_merge_commits` test Due to the way "git subtree" works, the `check_merge_commits` test _will_ find merge commits and fail, so we simply skip it. This changed is tracked in: * rust-lang/rust-analyzer#12818 Maintainer impact: none

Building it in-place fails in rust CI because the source directory is read-only. This changes `proc-macro-test`'s build script to first copy `imp` under `OUT_DIR` (which is read-write). It also prints stdout/stderr for the nested cargo invocation, should it fail. (I've seen failures in rust CI that I couldn't explain, and when they take 25 minutes to reproduce, you want to have that info)

This exercises some of the upcoming proc_macro bridge changes. It should also pass for all supported ABIs, with the older-style bridge.

Co-authored-by: Laurențiu Nicola <[email protected]>

…-dir, r=fasterthanlime Build proc-macro-test-impl out-of-tree Building it in-place fails in rust CI because the source directory is read-only. This changes `proc-macro-test`'s build script to first copy `imp` under `OUT_DIR` (which is read-write). It also prints stdout/stderr for the nested cargo invocation, should it fail. (I've seen failures in rust CI that I couldn't explain, and when they take 25 minutes to reproduce, you want to have that info) This change is tracked in: * rust-lang/rust-analyzer#12818 Maintainer impact: none.

Add proc-macro-srv integration test that clones literals This exercises some of the upcoming proc_macro bridge changes. It should also pass for all supported ABIs, with the older-style bridge. This changed is tracked in: * rust-lang/rust-analyzer#12818

This allows overriding the toolchain used to run `proc-macro-srv` tests.

…ain, r=Veykril Add PROC_MACRO_TEST_TOOLCHAIN environment variable This allows overriding the toolchain used to run `proc-macro-srv` tests. --- Sample usage. Testing the current ABI (variable unset/empty): ```shell amos@tails ~/bearcove/rust-analyzer/crates/proc-macro-srv proc-macro-test-toolchain* ❯ PROC_MACRO_TEST_TOOLCHAIN="" cargo test --quiet running 16 tests ................ test result: ok. 16 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s ``` Testing an older ABI: ```shell amos@tails ~/bearcove/rust-analyzer/crates/proc-macro-srv proc-macro-test-toolchain* ❯ PROC_MACRO_TEST_TOOLCHAIN="1.58" cargo test --quiet running 16 tests ................ test result: ok. 16 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s ``` Testing current nightly ABI: ```shell ❯ rustc +nightly --version rustc 1.64.0-nightly (f858854 2022-07-18) ❯ PROC_MACRO_TEST_TOOLCHAIN="nightly" cargo test --quiet running 16 tests ................ test result: ok. 16 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s ``` Testing future ABI (`rust-lang/rust` master): ```shell amos@tails ~/bearcove/rust-analyzer/crates/proc-macro-srv proc-macro-test-toolchain ❯ PROC_MACRO_TEST_TOOLCHAIN="stage1" cargo test --quiet running 16 tests ..........thread '<unnamed>' panicked at 'range end index 216221164920373249 out of range for slice of length 18', library/core/src/slice/index.rs:73:5 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ....F. failures: ---- tests::test_fn_like_macro2 stdout ---- thread 'tests::test_fn_like_macro2' panicked at 'called `Result::unwrap()` on an `Err` value: "range end index 216221164920373249 out of range for slice of length 18"', crates/proc-macro-srv/src/tests/utils.rs:38:83 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace failures: tests::test_fn_like_macro2 test result: FAILED. 15 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s error: test failed, to rerun pass '--lib ``` --- Tagging `@jonas-schievink:` this might be helpful when updating versioned ABIs later on.

internal: Construct fewer `AstIdMap`s in lowering

… as a query

fix: Fix `trait_impls_in_deps_query` being called directly instead of as a query Fixes the inlay hint performance regression introdcuced by rust-lang/rust-analyzer#12549

Otherwise, fall back to the multi ABI scheme, except in testing, where it becomes a hard error. This should make it possible to use a rustup-provided rust-analyzer with proc macro dylibs compiled by older rustcs, and it'll also catch changes to the format of `rustc --version` or the `.rustc` section that would make them impossible to compare for equality.

…nterner)

…ef-counted

…ey land

…hanlime Introduce proc-macro-srv/sysroot-abi Still a WIP. This change is tracked by: * rust-lang/rust-analyzer#12818

fix: Improve syntax highlighting in attributes Fixes rust-lang/rust-analyzer#12842

internal: Use ItemTree for variant, field and module attribute collection in attrs_query Less parsing = very good, should speed up lang item collection as that basically probes attributes of all enum variants which currently triggers parsing Not fond of how this is searching for the correct index, ideally we'd map between HIR and item tree Id here but I am not sure how, storing the item tree ids in the HIR version doesn't work due to the usage of `Trace`...

fix: Fix restart server duplicating language clients Reverts 03a62c1 [email protected] and beyond changed the behaviour of language clients to be automatically started if a request comes in while they are not running. Currently when we restart the server via the restart command we recreate the language client, which causes VSCode to restart the stopped server, effectively duplicating our language clients... Reverting the commit is simpler right now, the proper fix would be to only create a language client once and then use the `restart` functionality on it instead. Fixes rust-lang/rust-analyzer#12836

fix: Fix error tooltip message for VSCode status bar item

internal: Don't parse files unnecessarily in scope_for_offset

fix generate_new doc Looks like this got copied from `generate_impl` without adjusting the description.

When the cursor is in a match arm, but before the fat arrow (=>) token, don't add braces when autocompleting "if". fixes rust-lang#12823

…match-guard, r=Veykril fix: Don't add braces to 'if' completion in match guard position fixes rust-lang#12823 Is this what you were thinking of here, `@Veykril` ? I haven't done any work on completions before, so I could definitely be misunderstanding the issue.

…d-all-the-time-please, r=Veykril feat: don't highlight the whole fn on return-type mismatch

…9d466af9eb613bb' git-subtree-dir: src/tools/rust-analyzer git-subtree-mainline: 3c98486 git-subtree-split: 977e12a

…by default

…eta'

Co-authored-by: Joshua Nelson <[email protected]>

- use `path` instead of `paths` - don't mark rust-analyzer as an optional tool - print the cargo command that's run in the proc-macro-test build script this originally was part of a change to fix `test --stage 0 rust-analyzer`, but I'm going to leave that for a separate PR so it's easier to review.

…on order isn't guaranteed (And, in fact, it failed on i686)

…@jyn514

…@jyn514, and @lnicola)

Commits on Jul 10, 2022

fix: ignore renames for crate root

harpsword committed Jul 10, 2022

Configuration menu

View commit details

Copy full SHA for 4b3164f

Browse repository at this point

Copy the full SHA

4b3164f View commit details

Browse the repository at this point in the history

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert rust-analyzer to an in-tree tool #99603

Convert rust-analyzer to an in-tree tool #99603

Commits on Jul 2, 2022

Commits on Jul 3, 2022

Commits on Jul 4, 2022

Commits on Jul 5, 2022

Commits on Jul 6, 2022

Commits on Jul 8, 2022

Commits on Jul 9, 2022

Commits on Jul 10, 2022

Commits on Jul 11, 2022

Commits on Jul 12, 2022

Commits on Jul 13, 2022

Commits on Jul 14, 2022

Commits on Jul 15, 2022

Commits on Jul 16, 2022

Commits on Jul 17, 2022

Commits on Jul 18, 2022

Commits on Jul 19, 2022

Commits on Jul 20, 2022

Commits on Jul 21, 2022

Commits on Jul 22, 2022

Commits on Jul 23, 2022

Commits on Jul 24, 2022