aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge #2679bors[bot]2019-12-295-14/+63
|\
| * Remove unused hard-coded pathsEmil Lauridsen2019-12-291-4/+0
| * Resolve traits in infer using lang item infrastructureEmil Lauridsen2019-12-293-10/+19
| * Add helpers for unpacking lang itemsEmil Lauridsen2019-12-291-0/+44
* | Merge #2061bors[bot]2019-12-297-14/+369
|\ \ | |/ |/|
| * Fix https://github.com/rust-analyzer/rust-analyzer/pull/2061#discussion_r3487...Seivan Heidari2019-12-234-16/+20
| * Merge branch 'master' into feature/themesSeivan Heidari2019-12-23233-10763/+14882
| |\
| * \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-28150-3077/+3558
| |\ \
| * \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-252-5/+55
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-2594-1904/+2468
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-223-7/+54
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-2228-510/+763
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-2182-1067/+1451
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-2017-27/+358
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-182-49/+91
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-1825-429/+370
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-182-3/+89
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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 branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-1540-2136/+2620
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-1437-774/+904
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-1224-679/+842
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-123-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-129-22/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-1134-439/+1072
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-105-6/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Probably a better approach to check for values before assigning lest we repla...Seivan Heidari2019-11-101-3/+27
| * | | | | | | | | | | | | | | | | | | | Vscode wasn't running the linter automatically so ran `npm run fix` - wonder ...Seivan Heidari2019-11-096-106/+110
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-0920-190/+406
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-094-281/+304
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-073-61/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-078-71/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ...Seivan Heidari2019-11-051-12/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feature/themesSeivan Heidari2019-11-052-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | See if this satisfies the CI.Seivan Heidari2019-11-051-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo.Seivan Heidari2019-11-041-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | Clearer docs usage under `rust-analyzer.scopeMappings`.Seivan Heidari2019-11-041-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove new line.Seivan Heidari2019-11-041-1/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | Logging fallback tag in case scopes are missing.Seivan Heidari2019-11-041-3/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into feature/themesSeivan Heidari2019-11-0420-342/+323
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding scope mapping configuration manifest in `package.json`Seivan Heidari2019-11-046-68/+151
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into feature/themesSeivan Heidari2019-11-0461-1312/+1810
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feature/themesSeivan Heidari2019-11-0212-103/+605
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feature/themesSeivan Heidari2019-10-319-217/+240
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making loadColors more readable by monading all the things.Seivan Heidari2019-10-311-23/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding better debugging for testing themes missing tags and which scopes didn...Seivan Heidari2019-10-313-45/+58
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into feature/themesSeivan Heidari2019-10-31129-2755/+4949
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `jsonc-parser` since vscode can load the package. Might need it later ...Seivan Heidari2019-10-272-6/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding debugging to figure out missing scopes from theme.Seivan Heidari2019-10-272-11/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding all the decorators from RA to map.Seivan Heidari2019-10-271-0/+6