]>
git.lizzy.rs Git - rust.git/log
Florian Diebold [Wed, 20 Nov 2019 19:30:41 +0000 (20:30 +0100)]
Add rust-analyzer-expand-macro function for Emacs
bors[bot] [Wed, 20 Nov 2019 19:23:31 +0000 (19:23 +0000)]
Merge #2332
2332: Add HasResolver trait r=matklad a=matklad
bors merge
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 19:03:09 +0000 (22:03 +0300)]
Alternative quite tests alias
Aleksey Kladov [Wed, 20 Nov 2019 19:00:57 +0000 (22:00 +0300)]
Simplify
Aleksey Kladov [Wed, 20 Nov 2019 18:55:33 +0000 (21:55 +0300)]
Add HasResolver trait
bors[bot] [Wed, 20 Nov 2019 18:38:00 +0000 (18:38 +0000)]
Merge #2330
2330: Remove hir/adt.rs r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 18:08:39 +0000 (21:08 +0300)]
Remove hir/adt.rs
bors[bot] [Wed, 20 Nov 2019 18:16:35 +0000 (18:16 +0000)]
Merge #2329
2329: fix 2190; add test for "replace if let with match" r=matklad a=fkohlgrueber
Fixes #2190.
Check that the expression doesn't contain newlines only for "replace if let with match". For "join lines", enclosing blocks for multiline expressions should be removed.
Co-authored-by: Felix Kohlgrüber <felix.kohlgrueber@gmail.com>
Felix Kohlgrüber [Wed, 20 Nov 2019 18:01:06 +0000 (19:01 +0100)]
fix 2190; add test for "replace if let with match"
Aleksey Kladov [Wed, 20 Nov 2019 17:50:34 +0000 (20:50 +0300)]
Simplify generic params
bors[bot] [Wed, 20 Nov 2019 17:39:00 +0000 (17:39 +0000)]
Merge #2328
2328: Move generic_params query to HIR r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 17:33:18 +0000 (20:33 +0300)]
Move generic_params query to HIR
bors[bot] [Wed, 20 Nov 2019 15:45:22 +0000 (15:45 +0000)]
Merge #2327
2327: Move constants to new ID r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 15:00:01 +0000 (18:00 +0300)]
Move constants to new ID
This allows us to get rid of trait item index
Aleksey Kladov [Wed, 20 Nov 2019 14:49:57 +0000 (17:49 +0300)]
Don't duplicate ContainerId type
Aleksey Kladov [Wed, 20 Nov 2019 14:39:58 +0000 (17:39 +0300)]
Switch type aliases to new sources
bors[bot] [Wed, 20 Nov 2019 13:43:34 +0000 (13:43 +0000)]
Merge #2326
2326: Remove duplicate tests r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 13:25:00 +0000 (16:25 +0300)]
Remove duplicate tests
bors[bot] [Wed, 20 Nov 2019 13:36:19 +0000 (13:36 +0000)]
Merge #2318
2318: Fix panic when use `Expand Macro` on `assert_eq` r=matklad a=edwin0cheng
The cause of this [bug](https://github.com/rust-analyzer/rust-analyzer/pull/2291#issuecomment-
555651542 ) is, when calling `SourceAnalyzer::expand` when an `ast::MacroCall` which is outside of `SourceAnalyzer::node`.
Note that if we use a node in `SourceAnalyzer::new` with a `MacroFile` file id, the resolver inside `SourceAnalyzer` still will not work properly. Another PR will need to fix it.
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Wed, 20 Nov 2019 04:21:31 +0000 (12:21 +0800)]
Fix expand macro
bors[bot] [Wed, 20 Nov 2019 13:23:38 +0000 (13:23 +0000)]
Merge #2325
2325: Next gen IDs for functions r=matklad a=matklad
The current system with AstIds has two primaraly drawbacks:
* It is possible to manufacture IDs out of thin air.
For example, it's possible to create IDs for items which are not
considered in CrateDefMap due to cfg. Or it is possible to mixup
structs and unions, because they share ID space.
* Getting the ID of a parent requires a secondary index.
Instead, the plan is to pursue the more traditional approach, where
each items stores the id of the parent declaration. This makes
`FromSource` more awkward, but also more correct: now, to get from an
AST to HIR, we first do this recursively for the parent item, and the
just search the children of the parent for the matching def
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 13:03:59 +0000 (16:03 +0300)]
Next gen IDs for functions
The current system with AstIds has two primaraly drawbacks:
* It is possible to manufacture IDs out of thin air.
For example, it's possible to create IDs for items which are not
considered in CrateDefMap due to cfg. Or it is possible to mixup
structs and unions, because they share ID space.
* Getting the ID of a parent requires a secondary index.
Instead, the plan is to pursue the more traditional approach, where
each items stores the id of the parent declaration. This makes
`FromSource` more awkward, but also more correct: now, to get from an
AST to HIR, we first do this recursively for the parent item, and the
just search the children of the parent for the matching def
bors[bot] [Wed, 20 Nov 2019 11:27:10 +0000 (11:27 +0000)]
Merge #2324
2324: Move traits to hir_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 11:22:06 +0000 (14:22 +0300)]
Move traits to hir_def
bors[bot] [Wed, 20 Nov 2019 10:10:03 +0000 (10:10 +0000)]
Merge #2323
2323: Rename with_ast -> with_value r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 10:09:21 +0000 (13:09 +0300)]
Rename with_ast -> with_value
bors[bot] [Wed, 20 Nov 2019 09:35:50 +0000 (09:35 +0000)]
Merge #2322
2322: Move Generics to hir_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 09:25:02 +0000 (12:25 +0300)]
Move Generics to hir_def
bors[bot] [Wed, 20 Nov 2019 08:47:42 +0000 (08:47 +0000)]
Merge #2321
2321: Allow non-path default type parameters r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 08:42:58 +0000 (11:42 +0300)]
Allow non-path default type parameters
bors[bot] [Wed, 20 Nov 2019 06:51:40 +0000 (06:51 +0000)]
Merge #2320
2320: Cleanup imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 06:47:14 +0000 (09:47 +0300)]
Cleanup imports
bors[bot] [Wed, 20 Nov 2019 06:44:37 +0000 (06:44 +0000)]
Merge #2319
2319: Rename Source::ast -> Source::value r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 20 Nov 2019 06:40:36 +0000 (09:40 +0300)]
Rename Source::ast -> Source::value
Aleksey Kladov [Tue, 19 Nov 2019 21:02:44 +0000 (00:02 +0300)]
add ws
Aleksey Kladov [Wed, 20 Nov 2019 05:38:25 +0000 (08:38 +0300)]
Merge pull request #2297 from kiljacken/master
Add fancy truncation of type hints.
bors[bot] [Tue, 19 Nov 2019 18:14:00 +0000 (18:14 +0000)]
Merge #2314
2314: :arrow_up: rowan r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 19 Nov 2019 18:13:36 +0000 (21:13 +0300)]
:arrow_up: rowan
bors[bot] [Tue, 19 Nov 2019 17:53:27 +0000 (17:53 +0000)]
Merge #2291
2291: Show expanded macro in vscode r=matklad a=edwin0cheng
*Edited*
![new_screen_shot](https://user-images.githubusercontent.com/
11014119 /
69169852 -
00550c00 -0b34-11ea-9c40-
8ecebdca0621 .gif)
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Tue, 19 Nov 2019 17:22:28 +0000 (01:22 +0800)]
Minor fix for outpu text formating
Edwin Cheng [Tue, 19 Nov 2019 17:12:56 +0000 (01:12 +0800)]
Add shot doc for expand_macro module
Edwin Cheng [Tue, 19 Nov 2019 17:09:15 +0000 (01:09 +0800)]
Add document in features.md
Edwin Cheng [Tue, 19 Nov 2019 17:06:10 +0000 (01:06 +0800)]
Use DocumentProvider instead of Hover
Emil Lauridsen [Tue, 19 Nov 2019 16:40:38 +0000 (17:40 +0100)]
Add test for inlay hint truncation
Emil Lauridsen [Mon, 18 Nov 2019 17:02:28 +0000 (18:02 +0100)]
Move type inlay hint truncation to language server
This commit implements a general truncation framework for HirFormatter
that keeps track of how much has been output so far. This information
can then be used to perform truncation inside the language server,
instead of relying on the client.
Initial support is implemented for truncating types hints using the
maxInlayHintLength server config option. The existing solution in the
VSCode extension has been removed in favor of letting the server
truncate type hints.
Edwin Cheng [Tue, 19 Nov 2019 16:12:48 +0000 (00:12 +0800)]
Improve insert_whitespaces
Edwin Cheng [Tue, 19 Nov 2019 14:56:48 +0000 (22:56 +0800)]
Change return type of expand_macro
Edwin Cheng [Tue, 19 Nov 2019 14:56:28 +0000 (22:56 +0800)]
Change to use Expansion::file_id and reordering
Edwin Cheng [Sun, 17 Nov 2019 19:39:11 +0000 (03:39 +0800)]
Fix npm formatting
Edwin Cheng [Sun, 17 Nov 2019 19:35:46 +0000 (03:35 +0800)]
Rebase
Edwin Cheng [Sun, 17 Nov 2019 18:47:50 +0000 (02:47 +0800)]
Add recursive expand in vscode
bors[bot] [Tue, 19 Nov 2019 08:27:27 +0000 (08:27 +0000)]
Merge #2312
2312: Fixed string literal quoting r=matklad a=edwin0cheng
It fixed a bug which `quote!` should return a literal escaped instead of original string.
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 16:33:55 +0000 (19:33 +0300)]
Run CI on trying as well
Edwin Cheng [Fri, 15 Nov 2019 14:13:41 +0000 (22:13 +0800)]
Fixed a bug for string lit in quote
bors[bot] [Mon, 18 Nov 2019 20:04:36 +0000 (20:04 +0000)]
Merge #2309
2309: Goto type def through macros r=matklad a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Mon, 18 Nov 2019 19:57:42 +0000 (14:57 -0500)]
Goto type def through macros
bors[bot] [Mon, 18 Nov 2019 19:57:06 +0000 (19:57 +0000)]
Merge #2307
2307: Support hover through macro r=matklad a=kjeremy
Allows hover to work through macros like `match_ast!`.
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Mon, 18 Nov 2019 19:02:02 +0000 (14:02 -0500)]
Fix test
bors[bot] [Mon, 18 Nov 2019 18:21:44 +0000 (18:21 +0000)]
Merge #2308
2308: Remove the custom impl of AttrsOwner for ImplItem r=matklad a=DJMcNab
The default impl should have the same behaviour, and it can be generated by codegen.
See also `ModuleItem` and `NominalDef`.
Also see https://github.com/rust-analyzer/rust-analyzer/commit/
5dbbfda34ae423229487595fd0ae9e727ae42906 #r36011245
Co-authored-by: DJMcNab <36049421+djmcnab@users.noreply.github.com>
DJMcNab [Mon, 18 Nov 2019 18:13:56 +0000 (18:13 +0000)]
Remove the custom impl of AttrsOwner for ImplItem
The default impl should have the same behaviour, and it can be generated
by codegen.
See also `ModuleItem` and `NominalDef`
kjeremy [Mon, 18 Nov 2019 16:58:42 +0000 (11:58 -0500)]
Support hover through macro
bors[bot] [Mon, 18 Nov 2019 16:28:04 +0000 (16:28 +0000)]
Merge #2305
2305: Remove CI badge r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 16:27:41 +0000 (19:27 +0300)]
Remove CI badge
bors[bot] [Mon, 18 Nov 2019 15:50:47 +0000 (15:50 +0000)]
Merge #2304
2304: Use Source<&ast::Name> in classify_name r=matklad a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Mon, 18 Nov 2019 15:47:19 +0000 (10:47 -0500)]
Use Source<&ast::Name> in classify_name
bors[bot] [Mon, 18 Nov 2019 13:09:29 +0000 (13:09 +0000)]
Merge #2302
2302: Collapse TokenMap and RevTokenMap r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 13:08:41 +0000 (16:08 +0300)]
Collapse TokenMap and RevTokenMap
bors[bot] [Mon, 18 Nov 2019 12:41:59 +0000 (12:41 +0000)]
Merge #2301
2301: Don't create a separate bin for format hook r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 12:22:51 +0000 (15:22 +0300)]
Don't create a separate bin for format hook
bors[bot] [Mon, 18 Nov 2019 12:09:24 +0000 (12:09 +0000)]
Merge #2300
2300: Token-based reverse-mapping r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 12:08:39 +0000 (15:08 +0300)]
Token-based reverse-mapping
bors[bot] [Mon, 18 Nov 2019 11:37:46 +0000 (11:37 +0000)]
Merge #2299
2299: More sources r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 11:36:11 +0000 (14:36 +0300)]
More sources
bors[bot] [Mon, 18 Nov 2019 11:24:35 +0000 (11:24 +0000)]
Merge #2298
2298: Add ra_ide_api::expand r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 11:23:24 +0000 (14:23 +0300)]
Add ra_ide_api::expand
This module should handle all tricky bits with mapping macro-expanded
HirFileId to original files the user actually can see in the editor
Aleksey Kladov [Mon, 18 Nov 2019 11:07:13 +0000 (14:07 +0300)]
More Source
bors[bot] [Mon, 18 Nov 2019 09:59:36 +0000 (09:59 +0000)]
Merge #2296
2296: Remove obsolete links r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 09:59:09 +0000 (12:59 +0300)]
fix bors integration
Aleksey Kladov [Mon, 18 Nov 2019 09:45:33 +0000 (12:45 +0300)]
Remove obsolete links
Aleksey Kladov [Mon, 18 Nov 2019 08:13:31 +0000 (11:13 +0300)]
Switch to Actions
cad97 [Sun, 17 Nov 2019 00:51:12 +0000 (19:51 -0500)]
Run npm travis through xvfb-run
cad97 [Sat, 16 Nov 2019 22:26:54 +0000 (17:26 -0500)]
Enable github actions ci
bors[bot] [Mon, 18 Nov 2019 07:36:27 +0000 (07:36 +0000)]
Merge #2294
2294: Publicise GenericParams r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 18 Nov 2019 07:35:33 +0000 (10:35 +0300)]
Publicise GenericParams
See https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Exposing.20GenericParam.2Ename
bors[bot] [Sun, 17 Nov 2019 19:25:51 +0000 (19:25 +0000)]
Merge #2292
2292: :arrow_up: rowan r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 17 Nov 2019 19:21:45 +0000 (22:21 +0300)]
:arrow_up: rowan
bors[bot] [Sun, 17 Nov 2019 17:17:21 +0000 (17:17 +0000)]
Merge #2289
2289: More correct expansion mapping r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 17 Nov 2019 17:15:55 +0000 (20:15 +0300)]
More correct expansion mapping
We can't really map arbitrary ranges, we only can map tokens
bors[bot] [Sun, 17 Nov 2019 16:12:28 +0000 (16:12 +0000)]
Merge #2288
2288: Make shift an implementation detail of mbe r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 17 Nov 2019 16:11:43 +0000 (19:11 +0300)]
Make shift an implementation detail of mbe
bors[bot] [Sun, 17 Nov 2019 15:45:30 +0000 (15:45 +0000)]
Merge #2287
2287: Disable doctests r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
bors[bot] [Sun, 17 Nov 2019 15:35:36 +0000 (15:35 +0000)]
Merge #2286
2286: Alias for less verbose tests r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 17 Nov 2019 15:35:05 +0000 (18:35 +0300)]
Disable doctests
Aleksey Kladov [Sun, 17 Nov 2019 15:26:52 +0000 (18:26 +0300)]
Alias for less verbose tests
bors[bot] [Sun, 17 Nov 2019 15:25:39 +0000 (15:25 +0000)]
Merge #2285
2285: Don't store shift redundantly r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 17 Nov 2019 15:22:34 +0000 (18:22 +0300)]
Don't store shift redundantly
bors[bot] [Sun, 17 Nov 2019 09:35:52 +0000 (09:35 +0000)]
Merge #2283
2283: Fix #2275 r=matklad a=edwin0cheng
Fix #2275
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Sun, 17 Nov 2019 05:18:42 +0000 (13:18 +0800)]
Add bound check
bors[bot] [Sat, 16 Nov 2019 19:51:25 +0000 (19:51 +0000)]
Merge #2280
2280: Add ast for plain and raw string literals r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 16 Nov 2019 19:50:41 +0000 (22:50 +0300)]
Add ast for plain and raw string literals