Seivan Heidari
3886164bcc
Probably a better approach to check for values before assigning lest we replace something.
2019-11-10 22:30:53 +01:00
Seivan Heidari
83a33fbbea
Vscode wasn't running the linter automatically so ran npm run fix
- wonder if it's related to tslint
being deprecated.
2019-11-09 17:23:30 +01:00
Seivan Heidari
529b227d42
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
2019-11-09 16:27:40 +01:00
bors[bot]
9d786ea221
Merge #2198
...
2198: Unfork struct and union ids r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-09 12:37:49 +00:00
Aleksey Kladov
6294fd5ec9
Unfork struct and union ids
2019-11-09 15:34:00 +03:00
bors[bot]
defc7ad772
Merge #2197
...
2197: Remove typed macro parsing API r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-09 10:16:48 +00:00
Aleksey Kladov
70f2a21b55
Remove typed macro parsing API
...
We do type-erasure on every path anyway, so it doesn't make much sense
to duplicate this function for every type
2019-11-09 13:14:10 +03:00
Aleksey Kladov
f6c40c09e0
Minor cleanup
2019-11-09 12:49:35 +03:00
bors[bot]
561bb979ce
Merge #2169
...
2169: MBE: Mapping spans for goto definition r=matklad a=edwin0cheng
Currently, go to definition gives the wrong span in MBE. This PR implement a mapping mechanism to fix it and it could be used for future MBE hygiene implementation.
The basic idea of the mapping is:
1. When expanding the macro, generated 2 `TokenMap` which maps the macro args and macro defs between tokens and input text-ranges.
2. Before converting generated `TokenTree` to `SyntaxNode`, generated a `ExpandedRangeMap` which is a mapping between token and output text-ranges.
3. Using these 3 mappings to construct an `ExpansionInfo` which can map between input text ranges and output text ranges.
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
2019-11-09 09:13:14 +00:00
Edwin Cheng
0a5ec69404
Remove map_ranges in RevTokenMap
2019-11-09 12:00:46 +08:00
Seivan Heidari
81662d23a6
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
2019-11-09 02:19:31 +01:00
bors[bot]
23939cabcc
Merge #2196
...
2196: Touch up nameres doc comment r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-08 21:24:02 +00:00
Aleksey Kladov
c626a677e8
Touch up nameres doc comment
2019-11-09 00:23:19 +03:00
Aleksey Kladov
657340e078
Reduce visibility
2019-11-09 00:23:11 +03:00
Aleksey Kladov
53945841be
Extract path resolution submodule
2019-11-09 00:17:17 +03:00
Aleksey Kladov
785887b382
Simplify
...
There's only one call-site for the function, so it seems fine to
inline
2019-11-08 23:53:39 +03:00
Aleksey Kladov
dc5e5f610c
Reduce visibility
2019-11-08 23:47:52 +03:00
Edwin Cheng
d01e0abdb5
Refactor and simpfily
2019-11-09 04:26:28 +08:00
Edwin Cheng
62ed93db13
Refactor and add more comments
2019-11-08 10:19:41 +08:00
Seivan Heidari
32d749c775
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
2019-11-07 20:08:11 +01:00
bors[bot]
ee798a02b3
Merge #2194
...
2194: Update crates r=matklad a=kjeremy
Removes nodrop and extra arrayvec
We have an extra crossbeam-queue and crossbeam-utils left but those should
drop once rayon accepts https://github.com/rayon-rs/rayon/pull/704
Co-authored-by: kjeremy <kjeremy@gmail.com>
2019-11-07 18:28:10 +00:00
kjeremy
91b154fa05
Update crates
...
Removes nodrop and extra arrayvec
We have an extra crossbeam-queue and crossbeam-utils left but those should
drop once rayon accepts https://github.com/rayon-rs/rayon/pull/704
2019-11-07 13:05:12 -05:00
Seivan Heidari
915460544a
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
2019-11-07 18:44:59 +01:00
bors[bot]
2a8d48d8a9
Merge #2193
...
2193: cargo xtask format with rust 1.39 r=matklad a=kjeremy
Needed to pass tests on latest stable
Co-authored-by: kjeremy <kjeremy@gmail.com>
2019-11-07 14:57:30 +00:00
kjeremy
e670a99413
cargo xtask format with 1.39
2019-11-07 09:44:45 -05:00
bors[bot]
14e19c0df1
Merge #2179
...
2179: Use HirDatabase to compute `is_deprecated` r=matklad a=martskins
This PR fixes #2167 by introducing `attributes_query` and adding `fn attrs(&self, def: crate::AttrDef) -> Option<Arc<[Attr]>>;` to the `DefDatabase` trait.
I'm a little concerned about the two spots in `attributes_query` where code is repeated, but I couldn't figure out a way to avoid that, so.. I welcome suggestions 😄
Co-authored-by: Martin Asquino <martin.asquino@gmail.com>
2019-11-06 21:11:42 +00:00
bors[bot]
ef988492ee
Merge #2191
...
2191: Cleanup complete_postfix r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-06 11:50:34 +00:00
Aleksey Kladov
b5349af05f
Cleanup complete_postfix
2019-11-06 14:50:03 +03:00
bors[bot]
d222608a45
Merge #2188
...
2188: Ignore line-endings when checking generated files for freshness r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-06 09:41:33 +00:00
Aleksey Kladov
5efd99a6e0
Ignore line-endings when checking generated files for freshness
...
closes #2184
2019-11-06 12:40:28 +03:00
Seivan Heidari
cae45677fa
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
2019-11-05 21:54:36 +01:00
bors[bot]
4fbb36db9b
Merge #2187
...
2187: Update smallvec to avoid UB and cc while we're at it r=kjeremy a=kjeremy
See: https://github.com/servo/rust-smallvec/releases/tag/v0.6.13
Co-authored-by: kjeremy <kjeremy@gmail.com>
2019-11-05 20:05:49 +00:00
kjeremy
8a2f16133f
Update smallvec to avoid UB and cc while we're at it
2019-11-05 15:04:00 -05:00
Seivan Heidari
b8053935b4
Merge branch 'master' into feature/themes
2019-11-05 20:13:11 +01:00
bors[bot]
ac7daf9cb9
Merge #2185
...
2185: Bump psm, console, indicatif r=kjeremy a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
2019-11-05 15:47:50 +00:00
kjeremy
49aea4202b
Bump psm, console, indicatif
2019-11-05 10:38:50 -05:00
Seivan Heidari
45533112c8
See if this satisfies the CI.
2019-11-05 14:22:09 +01:00
Edwin Cheng
568f3cff41
Fix formatting
2019-11-05 09:43:59 +08:00
Seivan Heidari
6012bbfc51
Fix typo.
2019-11-05 00:26:49 +01:00
Seivan Heidari
ec82ca8391
Clearer docs usage under rust-analyzer.scopeMappings
.
2019-11-05 00:18:16 +01:00
Seivan Heidari
2f1b363b39
Remove new line.
2019-11-05 00:16:31 +01:00
Seivan Heidari
f49781c32d
Logging fallback tag in case scopes are missing.
2019-11-05 00:11:43 +01:00
Seivan Heidari
8eb5148af7
Merge branch 'master' into feature/themes
2019-11-05 00:00:30 +01:00
Seivan Heidari
c60f9bf4c6
* Adding scope mapping configuration manifest in package.json
...
* Loading configurable scope mappings from settings.
* Updating Readme with `rust-analyzer.scopeMappings`.
`rust-analyzer.scopeMappings` -- a scheme backed JSON object to tweak Rust Analyzer scopes to TextMate scopes.
```jsonc
{
//Will autocomplete keys to available RA scopes.
"keyword.unsafe": ["keyword", "keyword.control"],
//Values are string | TextMateScope | [string | TextMateScope]
"comments": "comment.block"
}
```
2019-11-04 23:59:11 +01:00
Martin Asquino
cb3767f28a
HirDatabase stored attributes
2019-11-04 18:16:35 -03:00
bors[bot]
38f2bd21fb
Merge #2177
...
2177: Reduce visibility r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-04 20:37:59 +00:00
Aleksey Kladov
93d9e8a06f
Reduce visibility
2019-11-04 23:37:35 +03:00
bors[bot]
c08cff4fd6
Merge #2176
...
2176: Move Namespace enum closer to usage r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-04 20:03:11 +00:00
Aleksey Kladov
739babc391
Move Namespace enum closer to usage
2019-11-04 23:02:35 +03:00
bors[bot]
9c93fbf346
Merge #2175
...
2175: Appease the linter by dummy doc comments r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2019-11-04 19:35:43 +00:00