aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-182-49/+91
|\
| * Merge #2309bors[bot]2019-11-181-7/+29
| |\
| | * Goto type def through macroskjeremy2019-11-181-7/+29
| * | Merge #2307bors[bot]2019-11-181-42/+62
| |\ \
| | * | Fix testkjeremy2019-11-181-10/+6
| | * | Support hover through macrokjeremy2019-11-181-42/+66
| | |/
* | | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-1825-429/+370
|\| |
| * | Merge #2308bors[bot]2019-11-183-12/+4
| |\ \
| | * | Remove the custom impl of AttrsOwner for ImplItemDJMcNab2019-11-183-12/+4
| | |/
| * | Merge #2305bors[bot]2019-11-181-2/+0
| |\ \ | | |/ | |/|
| | * Remove CI badgeAleksey Kladov2019-11-181-2/+0
| |/
| * Merge #2304bors[bot]2019-11-184-25/+22
| |\
| | * Use Source<&ast::Name> in classify_namekjeremy2019-11-184-25/+22
| |/
| * Merge #2302bors[bot]2019-11-184-119/+105
| |\
| | * Collapse TokenMap and RevTokenMapAleksey Kladov2019-11-184-119/+105
| |/
| * Merge #2301bors[bot]2019-11-185-48/+36
| |\
| | * Don't create a separate bin for format hookAleksey Kladov2019-11-185-48/+36
| * | Merge #2300bors[bot]2019-11-183-38/+52
| |\|
| | * Token-based reverse-mappingAleksey Kladov2019-11-183-38/+52
| * | Merge #2299bors[bot]2019-11-182-41/+32
| |\|
| | * More sourcesAleksey Kladov2019-11-182-41/+32
| * | Merge #2298bors[bot]2019-11-184-61/+74
| |\|
| | * Add ra_ide_api::expandAleksey Kladov2019-11-184-55/+69
| | * More SourceAleksey Kladov2019-11-181-19/+18
| |/
| * Merge #2296bors[bot]2019-11-182-3/+1
| |\
| | * fix bors integrationAleksey Kladov2019-11-181-1/+1
| | * Remove obsolete linksAleksey Kladov2019-11-181-2/+0
| |/
| * Switch to ActionsAleksey Kladov2019-11-184-97/+61
* | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-182-3/+89
|\|
| * Run npm travis through xvfb-runcad972019-11-181-1/+1
| * Enable github actions cicad972019-11-181-0/+86
| * Merge #2294bors[bot]2019-11-181-3/+3
| |\
| | * Publicise GenericParamsAleksey Kladov2019-11-181-3/+3
* | | Readding jsonc parser because of https://github.com/rust-analyzer/rust-analyz...Seivan Heidari2019-11-183-3/+9
* | | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-1883-903/+1500
|\| |
| * | Merge #2292bors[bot]2019-11-171-3/+3
| |\ \ | | |/ | |/|
| | * :arrow_up: rowanAleksey Kladov2019-11-171-3/+3
| |/
| * Merge #2289bors[bot]2019-11-174-44/+74
| |\
| | * More correct expansion mappingAleksey Kladov2019-11-174-44/+74
| * | Merge #2288bors[bot]2019-11-173-47/+84
| |\|
| | * Make shift an implementation detail of mbeAleksey Kladov2019-11-173-47/+84
| |/
| * Merge #2287bors[bot]2019-11-1723-6/+65
| |\
| | * Disable doctestsAleksey Kladov2019-11-1723-6/+65
| * | Merge #2286bors[bot]2019-11-171-1/+1
| |\|
| | * Alias for less verbose testsAleksey Kladov2019-11-171-1/+1
| * | Merge #2285bors[bot]2019-11-171-6/+5
| |\ \ | | |/ | |/|
| | * Don't store shift redundantlyAleksey Kladov2019-11-171-6/+5
| |/
| * Merge #2283bors[bot]2019-11-171-2/+2
| |\
| | * Add bound checkEdwin Cheng2019-11-171-2/+2
| |/
| * Merge #2280bors[bot]2019-11-164-58/+98
| |\