aboutsummaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
* Merge #3781bors[bot]2020-03-312-1/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3781: Add crate versions when running cargo -p commands. r=matklad a=o0Ignition0o If someone (unfortunately) creates a project that happens to have the same name as one of its (future) dependencies, there is [a way for them to change the dependency's alias in the Cargo.toml file](https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#renaming-dependencies-in-cargotoml), to mitigate the name conflict. Unfortunately cargo -p commands don't seem to pick it up, which seems to put rust-analyzer run commands in a tough situation: ``` > Executing task: cargo test --package config --example default -- tests --nocapture < error: There are multiple `config` packages in your project, and the specification `config` is ambiguous. Please re-run this command with `-p <spec>` where `<spec>` is one of the following: config:0.1.0 config:0.9.3 The terminal process terminated with exit code: 101 ``` cargo suggests us to be more specific and refer to a package by its name and version, which this PR achieves. I passed the version as a String because I don't really understand how the ra_db types work, but I would love to switch it to [a fully fledged Version type](https://steveklabnik.github.io/semver/semver/index.html) if you guide me towards that :) Co-authored-by: o0Ignition0o <[email protected]>
| * Add crate versions when running cargo -p commands.o0Ignition0o2020-03-312-1/+15
| | | | | | | | | | | | | | Until now cargo commands with the -p flag would pass the package name only. It doesn't play super well with the toml Renaming dependencies feature. This commit specifies the package name and version when a cargo command is run with the -p flag, to avoid ambiguities.
* | Attach doc-comment to declaration if there are newlines in betweenLeander Tentrup2020-03-313-1/+32
|/ | | | This commit changes the parser to attach doc-comments to the corresponding declaration in case there are newlines in between the doc-comment and the declaration.
* Ignore createProgress request in testsAleksey Kladov2020-03-312-7/+8
| | | | closes #3783
* Merge #3775bors[bot]2020-03-301-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 3775: Fix typo r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Fix typoAleksey Kladov2020-03-301-1/+1
| |
* | Simplify SemanticTokensBuilder build methodkjeremy2020-03-302-6/+6
|/ | | | This matches the next stable vscode api
* Fix the endless progress bar issueKirill Bulatov2020-03-301-0/+10
|
* Rebase fixesKirill Bulatov2020-03-301-1/+1
|
* Avoid failing on incorrect settings responseKirill Bulatov2020-03-301-5/+13
|
* Small style fixKirill Bulatov2020-03-301-14/+21
|
* Code review fixesKirill Bulatov2020-03-302-12/+10
| | | | Co-Authored-By: Veetaha <[email protected]>
* Small style fixKirill Bulatov2020-03-301-1/+1
| | | Co-Authored-By: Veetaha <[email protected]>
* Remove an obsolete fixmeKirill Bulatov2020-03-301-1/+0
|
* Reload watcher configurationKirill Bulatov2020-03-301-14/+19
|
* Style fixesKirill Bulatov2020-03-301-15/+24
|
* Reload only the properties that do not affect vfsKirill Bulatov2020-03-304-60/+89
|
* Read new config on the server sideKirill Bulatov2020-03-301-9/+18
|
* Process configuration response draftKirill Bulatov2020-03-301-20/+21
|
* Client side draftKirill Bulatov2020-03-302-2/+8
|
* Use IntoIterAleksey Kladov2020-03-302-6/+5
|
* Merge #3761bors[bot]2020-03-302-35/+164
|\ | | | | | | | | | | | | | | 3761: Append new match arms rather than replacing all of them r=matklad a=mattyhall This means we now retain comments when filling in match arms. This fixes #3687. This is my first contribution so apologies if it needs a rethink! I think in particular the way I find the position to append to and remove_if_only_whitespace are a little hairy. Co-authored-by: Matthew Hall <[email protected]>
| * Tidy up insertion position logicMatthew Hall2020-03-291-20/+6
| |
| * Remove unneeded variablesMatthew Hall2020-03-291-4/+2
| |
| * Remove "TODO" in comment in testMatthew Hall2020-03-281-4/+4
| |
| * Append new match arms rather than replacing all of themMatthew Hall2020-03-282-35/+180
| | | | | | | | This means we now retain comments when filling in match arms.
* | Merge #3763bors[bot]2020-03-301-11/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 3763: Simplify r=matklad a=Veetaha Co-authored-by: veetaha <[email protected]>
| * | Simplifyveetaha2020-03-281-11/+4
| |/
* | Pull options outwardsAleksey Kladov2020-03-303-17/+14
| |
* | Fix race in the testsAleksey Kladov2020-03-303-2/+11
| |
* | Use automatic thread joining for cargo-watchAleksey Kladov2020-03-302-40/+9
| |
* | Fix review commentsEdwin Cheng2020-03-292-13/+13
| |
* | Move roots_to_scan to LoopStateEdwin Cheng2020-03-282-22/+22
|/
* Remove some unwrapsAleksey Kladov2020-03-285-29/+29
|
* Nice string formattingAleksey Kladov2020-03-2810-21/+34
|
* Start stdxAleksey Kladov2020-03-2812-88/+157
| | | | This crate will hold everything to small to be worth publishing
* Fix merge-imports assist for wildcard importsPiotr Szpetkowski2020-03-273-2/+36
|
* Fix assist descriptionAleksey Kladov2020-03-271-4/+8
|
* Merge #3742bors[bot]2020-03-275-5/+147
|\ | | | | | | | | | | | | | | | | | | | | 3742: Replace if with if-let r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Replace if with if-letAleksey Kladov2020-03-275-5/+147
| |
* | Merge #3741bors[bot]2020-03-272-2/+11
|\| | | | | | | | | | | | | | | | | | | | | 3741: More general ctor for ifs r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * More general ctor for ifsAleksey Kladov2020-03-272-2/+11
| |
* | Merge #3740bors[bot]2020-03-271-29/+28
|\| | | | | | | | | | | | | | | | | | | | | 3740: Simplify r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * SimplifyAleksey Kladov2020-03-271-29/+28
| |
* | Merge #3727bors[bot]2020-03-2619-38/+250
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3727: Introduce ra_proc_macro r=matklad a=edwin0cheng This PR implemented: 1. Reading dylib path of proc-macro crate from cargo check , similar to how `OUTDIR` is obtained. 2. Added a new crate `ra_proc_macro` and implement the foot-work for reading result from external proc-macro expander. 3. Added a struct `ProcMacroClient` , which will be responsible to the client side communication to the External process. Co-authored-by: Edwin Cheng <[email protected]>
| * | Remove deps on tt_mbeEdwin Cheng2020-03-269-47/+57
| | |
| * | Refactoring a bitEdwin Cheng2020-03-261-7/+12
| | |
| * | Add ProcMacroClientEdwin Cheng2020-03-2516-43/+220
| | |
| * | Add ra_proc_macroEdwin Cheng2020-03-252-0/+20
| | |
* | | Merge #3732bors[bot]2020-03-264-0/+207
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 3732: Assist: replace unwrap with match r=matklad a=unrealhoang attempt on #3669 Co-authored-by: Unreal Hoang <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:59:04 +0000