aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src
Commit message (Collapse)AuthorAgeFilesLines
...
*-. Merge #2500 #2505 #2506bors[bot]2019-12-081-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2500: Fix format_args expansion & go to definition r=matklad a=flodiebold The expansion of format_args wasn't yet correct enough to type-check. Also make macros in statement position expand to expressions for now, since it's not handled correctly in HIR lowering yet. This finally fixes go to definition within print macros, I think :slightly_smiling_face: 2505: Remove more dead code r=matklad a=matklad 2506: Remove one more Ty r=matklad a=matklad Co-authored-by: Florian Diebold <[email protected]> Co-authored-by: Aleksey Kladov <[email protected]>
| * | Expand macros in blocks to expressions for nowFlorian Diebold2019-12-081-3/+4
| |/ | | | | | | Expanding to statements isn't handled properly yet and breaks things.
| |
| \
*-. \ Merge #2501 #2502 #2503bors[bot]2019-12-081-149/+57
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2501: Fix coercion from &Foo to an inference variable in a reference r=matklad a=flodiebold We didn't try to unify within the reference, but we should. 2502: Delay legacy macro expansion r=matklad a=edwin0cheng This PR make the following changes: * Delay legacy macro expansion such that we concentrated all item collecting macro expansion in one place. * Add `MacroDirective` to replace 3-tuples * After this refactoring, no macro is expanded recursively, hence we can remove the `MacroStackMonitor` and we handle the expansion limit by the fix-point loop count. 2503: Code: check whether the LSP binary is in PATH r=matklad a=lnicola I'm not really sure about the TS changes. I just made a couple of functions async and it seems to work. Co-authored-by: Florian Diebold <[email protected]> Co-authored-by: Edwin Cheng <[email protected]> Co-authored-by: LaurenČ›iu Nicola <[email protected]>
| * | Delay legacy macro expansionEdwin Cheng2019-12-081-149/+57
| |/
* | Merge #2498bors[bot]2019-12-081-16/+26
|\ \ | |/ |/| | | | | | | | | | | 2498: Drop some unused methods r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Cleanup Field tyAleksey Kladov2019-12-081-16/+26
| |
* | Merge #2466bors[bot]2019-12-083-44/+165
|\ \ | |/ |/| | | | | | | | | | | | | | | | | 2466: Handle partial resolve cases r=matklad a=edwin0cheng Another try to fix #2443 : We resolve all imports every time in `DefCollector::collect` loop even it is resolved previously. This is because other unresolved imports and macros will bring in another `PerNs`, so we can only assume that it has been partially resolved. Co-authored-by: Edwin Cheng <[email protected]>
| * Refactor resolve_imports logicEdwin Cheng2019-12-072-40/+129
| |
| * Push glob_imports only if non-existsEdwin Cheng2019-12-071-4/+4
| |
| * Add testsEdwin Cheng2019-12-061-0/+32
| |
* | Remove MacroFileKindEdwin Cheng2019-12-082-6/+4
| |
* | Rename GenericParam -> TypeParamAleksey Kladov2019-12-074-29/+29
| | | | | | | | We don't have LifetimeParam yet, but they are planned!
* | Classify name works for TypeParamsAleksey Kladov2019-12-073-2/+35
| |
* | Track source of type parametersAleksey Kladov2019-12-071-21/+72
| |
* | MinorAleksey Kladov2019-12-071-3/+4
| |
* | Remove idx and parent generics from genericsAleksey Kladov2019-12-072-86/+42
| | | | | | | | | | This makes `hir_def::GenericParams` flatter. The logic for re-numbering the params is moved to hir instead.
* | Store GenericParams in arenaAleksey Kladov2019-12-073-13/+24
| |
* | Merge #2484bors[bot]2019-12-065-277/+299
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 2484: DynMap r=matklad a=matklad Implement a `DynMap` a semi-dynamic, semi-static map, which helps to thread heterogeneously typed info in a uniform way. Totally inspired by https://github.com/JetBrains/kotlin/blob/df3bee30384787d8951ea548a4257c2cb52a16a3/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java. @flodiebold wdyt? Seems like a potentially useful pattern for various source-map-like things. Co-authored-by: Aleksey Kladov <[email protected]>
| * | DynMapAleksey Kladov2019-12-065-277/+299
| |/ | | | | | | | | This might, or might not help us to reduce boilerplate associated with plumbing values from analysis to the IDE layer
* | Merge #2481bors[bot]2019-12-061-2/+0
|\ \ | |/ |/| | | | | | | | | | | 2481: Remove obsolete comment r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Remove obsolete commentAleksey Kladov2019-12-051-2/+0
| |
* | Merge #2479bors[bot]2019-12-057-11/+118
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 2479: Add expansion infrastructure for derive macros r=matklad a=flodiebold I thought I'd experiment a bit with attribute macro/derive expansion, and here's what I've got so far. It has dummy implementations of the Copy / Clone derives, to show that the approach works; it doesn't add any attribute macro support, but I think that fits into the architecture. Basically, during raw item collection, we look at the attributes and generate macro calls for them if necessary. Currently I only do this for derives, and just add the derive macro calls as separate calls next to the item. I think for derives, it's important that they don't obscure the actual item, since they can't actually change it (e.g. sending the item token tree through macro expansion unnecessarily might make completion within it more complicated). Attribute macros would have to be recognized at that stage and replace the item (i.e., the raw item collector will just emit an attribute macro call, and not the item). I think when we implement this, we should try to recognize known inert attributes, so that we don't do macro expansion unnecessarily; anything that isn't known needs to be treated as a possible attribute macro call (since the raw item collector can't resolve the macro yet). There's basically no name resolution for attribute macros implemented, I just hardcoded the built-in derives. In the future, the built-ins should work within the normal name resolution infrastructure; the problem there is that the builtin stubs in `std` use macros 2.0, which we don't support yet (and adding support is outside the scope of this). One aspect that I don't really have a solution for, but I don't know how important it is, is removing the attribute itself from its input. I'm pretty sure rustc leaves out the attribute macro from the input, but to do that, we'd have to create a completely new syntax node. I guess we could do it when / after converting to a token tree. Co-authored-by: Florian Diebold <[email protected]>
| * Add expansion infrastructure for derive macrosFlorian Diebold2019-12-057-11/+118
| |
* | Introduce ChildFromSourceAleksey Kladov2019-12-052-0/+277
|/
* Publicize `file_id` to make `test_db` compileice10002019-12-051-1/+1
|
* Use placeholder instead of `Option`ice10002019-12-052-14/+10
|
* One pub function less is good!ice10002019-12-051-5/+0
|
* Reduce visibility, use struct instead of tuplesice10002019-12-051-20/+23
|
* No block at the momentice10002019-12-041-6/+1
|
* Remove almost unused `ModuleSource::new`ice10002019-12-041-19/+1
|
* Confluent `ModuleSource` usageice10002019-12-041-13/+5
|
* Add `ModuleSource::Block`ice10002019-12-041-2/+66
|
* Fix test compilationice10002019-12-041-1/+1
|
* Three-state enum for module originice10002019-12-042-20/+78
|
* Replace `ra_hir_expand::either` with crateice10002019-12-038-35/+33
|
* Merge #2455bors[bot]2019-12-015-31/+102
|\ | | | | | | | | | | | | | | | | | | 2455: Add BuiltinShadowMode r=flodiebold a=edwin0cheng This PR try to fix #1905 by introduce an `BuiltinShadowMode` in name resolving functions. cc @flodiebold Co-authored-by: Edwin Cheng <[email protected]>
| * Remove some empty linesEdwin Cheng2019-12-011-2/+0
| |
| * Use index instead of peekableEdwin Cheng2019-12-011-35/+19
| |
| * Fix commentEdwin Cheng2019-12-011-2/+1
| |
| * Add BuiltinShadowModeEdwin Cheng2019-11-305-30/+120
| |
* | Reduce variants of Exproxalica2019-11-292-38/+19
| |
* | Infer range typesoxalica2019-11-283-4/+76
|/
* Move source-related traits to a separate moduleAleksey Kladov2019-11-288-58/+72
|
* Use InFile for AstIdAleksey Kladov2019-11-284-11/+11
|
* Rename Source -> InFileAleksey Kladov2019-11-289-44/+44
|
* Use Name::missing consistentlyAleksey Kladov2019-11-273-15/+16
|
* ReformatAleksey Kladov2019-11-271-2/+1
|
* Rename module_id -> local_idAleksey Kladov2019-11-278-24/+24
|
* Move TyAleksey Kladov2019-11-271-1/+1
|
* DecoupleAleksey Kladov2019-11-271-0/+10
|