aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update depskjeremy2020-03-311-14/+14
|
* Merge #3786bors[bot]2020-03-312-14/+45
|\ | | | | | | | | | | | | | | | | | | | | 3786: When adding match arm, don't let the floating comma r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * When adding match arm, don't let the floating commaAleksey Kladov2020-03-312-14/+45
| |
* | 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.
* | Merge #3785bors[bot]2020-03-313-1/+32
|\ \ | |/ |/| | | | | | | | | | | | | | | 3785: Attach doc-comment to declaration if there are newlines in between r=matklad a=ltentrup 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. Implements the changes proposed in #3757 Co-authored-by: Leander Tentrup <[email protected]>
| * 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.
*-. Merge #3777 #3784bors[bot]2020-03-316-13/+80
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3777: Add basic task support r=matklad a=Timmmm This adds basic support for running `cargo build`, `cargo run`, etc. Fixes #1935 I have tested this and it seems to work. There are two things I'm not sure about: 1. The workspace folder handling seems wrong - just get the first workspace folder? Is this just a TODO item? I don't know if it is right to lift `workspaceFolder` up to `activate()` but I couldn't see another way. 2. If you manually add an entry to `tasks.json` like this: ``` { "type": "cargo", "command": "build", "problemMatcher": [ "$rustc" ], "group": "build" } ``` then VSCode somehow magically knows to run `cargo build`. The documentation for `resolveTask` *sounds* like I should have to implement that for it to work: ``` * Resolves a task that has no [`execution`](#Task.execution) set. Tasks are * often created from information found in the `tasks.json`-file. Such tasks miss * the information on how to execute them and a task provider must fill in * the missing information in the `resolveTask`-method. ``` But then it also says this: ``` * This method will not be * called for tasks returned from the above `provideTasks` method since those * tasks are always fully resolved. A valid default implementation for the * `resolveTask` method is to return `undefined`. ``` Either way, it works without implementing it so the only thing I can think is that it is doing some kind of crazy pattern matching of the tasks returned by `provideTasks()` and the ones found in `tasks.json`. 3784: Ignore createProgress request in tests r=matklad a=matklad closes #3783 bors r+ 🤖 Co-authored-by: Tim <[email protected]> Co-authored-by: Aleksey Kladov <[email protected]>
| | * 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
| | |
* | | Merge #3774bors[bot]2020-03-302-6/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 3774: Simplify SemanticTokensBuilder build method r=matklad a=kjeremy This matches the next stable vscode api Co-authored-by: kjeremy <[email protected]>
| * | Simplify SemanticTokensBuilder build methodkjeremy2020-03-302-6/+6
|/ / | | | | | | This matches the next stable vscode api
| * Pass string instread of WorkspaceFolderTim2020-03-313-5/+5
| |
| * Remove unnecessary null checkTim2020-03-311-3/+1
| |
| * Throw error if no folder is openedTim2020-03-313-4/+9
| |
| * Use namespace importTim2020-03-311-19/+11
| |
| * Add basic task supportTim2020-03-304-6/+77
|/ | | | This adds basic support for running `cargo build`, `cargo run`, etc.
* Merge #3666bors[bot]2020-03-3011-110/+205
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3666: Reload part of the server configuration without restarts r=matklad a=SomeoneToIgnore Partially addresses https://github.com/rust-analyzer/rust-analyzer/issues/2857 Closes #3751 Reloads all server configuration that's not related to VFS without restarts. The VFS-related parameters are not considered, since VFS is planned to be rewritten/replaced in the future and I have a suspicion that with the current code, swapping the VFS and the file watchers on the fly will cause big troubles. I have to store and process the config request id separately, since the `workspace/configuration` response returns `any[]` (https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_configuration), if there's a better way to handle those responses, let me know. Co-authored-by: Kirill Bulatov <[email protected]>
| * 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-305-18/+18
| | | | | | | | 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-304-20/+31
| |
| * 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
| |
| * Send the config from the clientKirill Bulatov2020-03-302-24/+28
| |
| * Process configuration response draftKirill Bulatov2020-03-302-23/+24
| |
| * Client side draftKirill Bulatov2020-03-303-2/+14
|/
* Merge #3771bors[bot]2020-03-302-6/+5
|\ | | | | | | | | | | | | | | | | | | | | 3771: Use IntoIter r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * 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
| |/
* | Merge #3770bors[bot]2020-03-303-17/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3770: Pull options outwards r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Pull options outwardsAleksey Kladov2020-03-303-17/+14
| | |
* | | Merge #3754bors[bot]2020-03-305-44/+23
|\| | | | | | | | | | | | | | | | | | | | | | | 3754: Use automatic thread joining for cargo-watch r=matklad a=matklad r? @kiljacken Co-authored-by: Aleksey Kladov <[email protected]>
| * | Fix race in the testsAleksey Kladov2020-03-303-2/+11
| | |
| * | Use automatic thread joining for cargo-watchAleksey Kladov2020-03-303-40/+10
| | |
| * | :arrow_up: jod-threadAleksey Kladov2020-03-301-2/+2
|/ /
* | Merge pull request #3769 from matklad/btAleksey Kladov2020-03-301-0/+1
|\ \ | | | | | | Enable backtrace on CI
| * | Enable backtrace on CIAleksey Kladov2020-03-301-0/+1
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:57:06 +0000