hasufell/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,113 Commits 1 Branch 0 Tags 17 MiB
2f40da76e6
Commit Graph

459 Commits

Author SHA1 Message Date
Sven-Hendrik Haase
51b127a4fd Add glslls (#1179) 
* Add glslls-based LSP linter
* Make logfile configureable
 2017-12-01 17:36:44 +00:00
Carlos Coêlho
daee4a4722 Add prospector for checking Python code (#1183) 2017-12-01 17:04:30 +00:00
w0rp
a990188e27 Fix #1176 - Add an option for caching failing executable checks 2017-11-30 10:34:51 +00:00
Evan Rutledge Borden
edb3a0c5e4 Add brittany for Haskell formatting 
`brittany` is one of the options for Haskell source formatting. This
adds the necessary fixer files and documentation to support `brittany`
in `ALE`.
 2017-11-28 17:58:13 -05:00
w0rp
0ab689db0a Allow warnings about trailing blank lines to be hidden for flake8 and pycodestyle 2017-11-28 10:08:34 +00:00
w0rp
4e821e64c7 Fix #1168 - Make the ruby linter executable configurable 2017-11-28 09:48:35 +00:00
Benjie Gillam
e84ee4332f Add support for linting GraphQL with ESLint 2017-11-27 14:41:49 +00:00
w0rp
17574e2fe1 Document go to definition support and put that and completion in an LSP section 2017-11-26 23:02:51 +00:00
w0rp
d07b5b71a4 Add support for post-processing fixer output 2017-11-22 22:32:53 +00:00
w0rp
5d2ab192cf Support fixer aliases, and make prettier-eslint and prettier-standard just work 2017-11-22 15:31:39 +00:00
w0rp
3f70f1cbf1 Disable piping buffer data into commands for fixing files where needed 2017-11-22 13:01:13 +00:00
Shogo NAMEKI
f20e5a4cf0 Add drafter for checking API Blueprint files (#1152) 2017-11-20 10:57:13 +00:00
w0rp
597507e519 Make the message formats configurable with buffer local variables 2017-11-19 23:44:09 +00:00
w0rp
151f9f857c Add an FAQ entry explaining how to configure ALE for different buffers. 2017-11-19 13:56:09 +00:00
w0rp
0e96d4576a
Merge pull request #1142 from rhysd/redpen-ext 
* redpen support for asciidoc, reST, LaTeX and Re:VIEW
* redpen: fix start column
* add redpen as text linter
 2017-11-17 16:34:01 +00:00
w0rp
5635b3c864 Fix #741 - Set highlights for entire lines when signs are disabled 2017-11-17 14:29:57 +00:00
rhysd
79f15b0e30 add redpen as text linter 2017-11-17 16:43:16 +09:00
rhysd
44cd07d39c redpen support for asciidoc, reST, LaTeX and Re:VIEW 2017-11-17 15:34:07 +09:00
w0rp
1f4f19cbd4
Merge pull request #1133 from nicwest/linter-clj-joker 
add joker handler for clojure
 2017-11-16 11:06:27 +00:00
rhysd
c9c52ef370 add tests and doc for redpen support 2017-11-16 18:40:10 +09:00
Nic West
eda20d0585 add joker handler for clojure 
Adds new linter for clojure using joker

https://github.com/candid82/joker

fixes #975
ref #544 #1040
 2017-11-15 22:23:46 +00:00
w0rp
37f2f70439 Update the documentation for GetLoclist 2017-11-15 09:16:36 +00:00
w0rp
48be035da8 Update the documentation for :ALEDetail 2017-11-14 23:29:48 +00:00
w0rp
6b2c61a5cc Fix #1128 - Add g:ale_linters_explicit for only enabling linters explicitly 2017-11-14 19:55:46 +00:00
Jeff Willette
20a01404f3 Added support for goimports fixer (#1123) 
* Added support for goimports fixer
* added test and executable check
* fixed test assertions to reflect executable check
 2017-11-14 17:37:22 +00:00
w0rp
16e7dc2371 Fix #1069 Support formatting the loclist messages with g:ale_loclist_msg_format 2017-11-14 10:28:36 +00:00
w0rp
a5f7f51c9a #1121 Tell people how to lint when leaving insert mode with Ctrl+C 2017-11-13 10:27:25 +00:00
w0rp
584e0bc7f2 #852 Support formatting echo messages with error codes. No linters set the code key yet 2017-11-13 00:47:34 +00:00
w0rp
70623ca8a7 Add support for showing Info severities in echoed messages 2017-11-12 23:19:26 +00:00
w0rp
7d056b0839 Update the documentation for the echo message format, so it makes more sense 2017-11-12 23:01:11 +00:00
w0rp
e7b9befaa6 Sort some linter entries alphabetically 2017-11-12 12:11:15 +00:00
w0rp
3c34848e02 Fix #510 Support checking LESS files with stylelint 2017-11-12 12:09:19 +00:00
w0rp
cd5da50531 Add tests for the command and executable callbacks, and make them use local node_modulse esxecutables like other linters 2017-11-12 11:25:24 +00:00
w0rp
d20e3bc71c #1108 Support setting b:ale_linter_aliases to a List 2017-11-12 10:56:53 +00:00
w0rp
b98387d0fa #1108 Support using Lists and 'all' for b:ale_linters 2017-11-12 10:56:53 +00:00
w0rp
099df0af52 #1108 Support selecting fixers with Lists 2017-11-12 10:56:53 +00:00
Michael Jungo
39107a48b9 Add ocaml-language-server for OCaml and ReasonML 2017-11-12 10:56:53 +00:00
w0rp
8e0d1f57c6 Fix a typo 2017-11-12 10:56:53 +00:00
w0rp
8cd1ccff84 #1095 Apply all patterns for g:ale_pattern_options, instead of just the first match 2017-11-12 10:56:53 +00:00
jnduli
6c60ca24c1 Add rstcheck linter to check for errors in restructured text (#1090) 2017-11-12 10:56:53 +00:00
w0rp
4952e2f143 #1098 Add protoc-gen-lint to the list of supported tools 2017-11-12 10:56:53 +00:00
Jeff Willette
8bc44ed585 Added support for linting of proto files (#1098) 
* Added support for linting of proto files
* Added function to get the proper protoc command
 2017-11-12 10:56:53 +00:00
Marcus Zanona
732d8e3ed6 Add support for linting less files with lessc 2017-11-09 10:39:39 -02:00
Auri
8a4cf923a8 Add PyLS linter (#1097) 
* Support PyLS (python language server)
* Replace pyls#GetProjectRoot and add more config types to ale#python#FindProjectRoot
 2017-11-08 17:58:56 +00:00
Taylor Blau
248a5eb2f6 ale_linters: add 'dafny' linter 2017-11-07 22:11:49 -08:00
w0rp
1bf894f48c Fix #1086 - Implement command chaining for fixers 2017-11-07 23:20:14 +00:00
aurieh
3a57e4d151 Update doc and README for Dart LSP 2017-11-07 10:55:43 +02:00
Simon Bugert
716b22d524 Add shfmt fixer for sh files (#1083) 
* Add shfmt fixer for sh files
* Add tests for shfmt fixer
 2017-11-05 21:24:41 +00:00
w0rp
9cd0d75c4f Fix #936 - Check the actual files for gosimple and staticcheck 2017-10-31 13:01:01 +00:00
w0rp
50f7ad3552 #857 - Add b:ale_fix_on_save for controlling fixing on save for specific buffers 2017-10-30 22:19:57 +00:00
w0rp
1575b3d7dd
Merge pull request #1059 from ahmedelgabri/reason-refmt 
refmt fixer for ReasonML
 2017-10-30 11:30:13 +00:00
Ahmed El Gabri
634eb1920c
refmt fixer for ReasonML 2017-10-29 21:48:28 +01:00
w0rp
daecbad543 Fix #719 - Add ALEReset and ALEResetBuffer for removing problems for all buffers or one buffer 2017-10-29 17:03:29 +00:00
w0rp
1aa737cdc9 #817 - Document the buffer toggling options, and define plug mappings for everything 2017-10-29 10:55:02 +00:00
Sam Howie
36898436b5 Add hackfmt fixer 2017-10-27 13:42:55 -07:00
w0rp
d4d939bea9 Fix #1039 - Only check the file on disk for dartanalyzer 2017-10-26 23:31:07 +01:00
Nathaniel Williams
e4456a4e0e Add tflint fot Terraform 2017-10-26 19:37:04 +01:00
w0rp
f15c8f4127 #1049 Do not modify runtimepath if the conflict warnings are disabled 2017-10-26 12:26:16 +01:00
w0rp
94bdabb8c3 Merge pull request #1044 from sumnerevans/mail-linters 
#955 Add vale linter for mail files
 2017-10-25 00:40:59 +01:00
Sumner Evans
7ac07a30b8 Fix #643 - Add support for write-good for many languages 2017-10-25 00:28:06 +01:00
Sumner Evans
780844ad73
#955 add documentation 2017-10-24 17:14:42 -06:00
w0rp
1a5ef969a5 Merge branch 'aurieh-master' 2017-10-24 22:45:30 +01:00
Christopher Swingley
1c56bebd7c proselint for mail files (#1037) 
Add proselint for mail files
 2017-10-24 22:34:38 +01:00
Zack Kourouma
07dad64acb adds fixer support for hfmt (#1027) 
Add support for fixing Haskell with hfmt
 2017-10-24 22:29:04 +01:00
Diego Oliveira
b172cd8b17 Add phan as a linter for php files (#1026) 
Add phan for checking PHP code
 2017-10-24 22:25:02 +01:00
w0rp
c248885e57 Merge pull request #1025 from kfox/add-rustfmt-fixer 
add rustfmt fixer
 2017-10-24 22:20:03 +01:00
aurieh
f0a0aef33d Update doc/ale.txt & README.md 2017-10-24 15:09:56 +03:00
Carlos Ramos
be1377f6d7 add basic documentation for elixir mix 2017-10-22 19:44:44 -04:00
Kelly Fox
35031a0b8a add rustfmt fixer 2017-10-21 12:31:49 -05:00
Zack Kourouma
e023e7a2fe add prettier fixer support for 'less' filetype 2017-10-20 18:29:57 -07:00
rhysd
4339af2bb6 add support for remark-lint 2017-10-19 18:17:04 +09:00
w0rp
010ebc2459 Fix a spelling mistake 2017-10-14 22:00:53 +01:00
w0rp
663fe75d0f #965 - Make the cursor echo delay configurable 2017-10-12 23:25:41 +01:00
w0rp
e71c4a8bea #965 - Support limiting the number of signs ALE will set 2017-10-12 23:04:54 +01:00
Linda_pp
70177480ba Add llc integration for LLVM IR (#979) 
Check LLVM IR with llc
 2017-10-10 10:13:09 +01:00
aliou
e376f0ae44 gofmt fixer for Go (#970) 
Add a gofmt fixer for golang.
 2017-10-03 18:54:35 +01:00
rhysd
753592ca66 Fix typos 2017-10-03 01:11:54 +09:00
Xristoph Hintermüller
8f6044b8b6 Implemented review recommendations 
Implements suggestions and recommendations suggested by the first review
of the "Advance C# linter based on mcs -t:module (#952)" pull request.

- Clarifies and simplifies description of linters and options
- Added links to help file and marked the mcsc linter as to be run only
  when file in buffer is saved or loaded.
- Added comments to the mcsc.vim file to clarify code
- removed type checks considered not necessary be reviewer.
- addresses findings by vader
- removed call to getcwd and cd in vim script
- handler expands file names relative to route of source tree into
  absolute pathes. Fixes errors not being marked when vim is started
  from subdirectory of source tree.
- implements tests for mcs.vim and mcsc.vim linter
 2017-09-27 13:21:05 +02:00
Jeff Sutherland
7302bedc5e Add solidity linter: solium 2017-09-14 01:59:22 +07:00
w0rp
9d24cc4047 Fix numerous issues with integration documentation tags and the table of contents, and add a script to check for theses issues 2017-09-10 19:42:45 +01:00
Clément DOUIN
18a7d32c4c Elm local install support (#915) 
* Add Elm support for npm local installation
 2017-09-10 12:58:42 +01:00
Clément DOUIN
f3da8f45c1 Add elm-format as a new fixer (#916) 
* Add elm-format as a new fixer
 2017-09-09 21:30:20 +01:00
Sven-Hendrik Haase
ff28836616 Add GLSL linter using glslang (#914) 
* Add a glslang linter for GLSL
 2017-09-08 11:06:47 +01:00
BlahGeek
73d031d7ea Add cuda nvcc linter (#874) 
* add cuda nvcc linter
 2017-09-07 19:23:58 +01:00
Peter Renström
03f1c1e81b Add 'prettier' fixer support to TypeScript, CSS, SCSS and JSON (#910) 
* Add prettier fixer support for typescript

* Add prettier fixer support for css and scss

* Add prettier fixer support for json

* Use getbufvar() to get &filetype
 2017-09-06 15:21:26 +01:00
w0rp
984c4f0658 Document the new lintr option 2017-09-03 23:36:58 +01:00
w0rp
e235e5a6a5 Make the grammar a little better for the g:ale_type_map option 2017-09-03 20:12:54 +01:00
Jake Zimmerman
63e8946fc8 Detect and use CM files for smlnj (#884) 
* Detect and use CM files for smlnj

* Split into two checkers

- one for CM projects
- one for single SML files

* Fix some typos

* Fix error caught by writing tests

We want to actually use `glob` to search in paths upwards from us.
(Previously we were just searching in the current directory every time!)

* Fix errors from former test run

* Write tests for GetCmFile and GetExecutableSmlnj

* Typo in 'smlnj/' fixture filenames
 2017-09-03 19:56:14 +01:00
w0rp
f9b43a566c #505 - Do not lint files on enter if the option for linting when the filetype changed is on 2017-09-02 16:57:01 +01:00
w0rp
7c2a5052a8 Fix #895 - Run Node.js scripts with node.exe instead of node on Windows 2017-08-31 13:12:24 +01:00
Pavel Pertsev
6e423a94cd Fix docs for prettier-eslint ver 2017-08-30 22:20:35 +01:00
w0rp
ed9cdca127 Merge remote-tracking branch 'randrej/master' into c-clang-tidy 2017-08-30 22:08:41 +01:00
Jon Parise
f4c5d29c64 Add a linter for Apache Thrift IDL files 
This linter works by invoking the `thrift` compiler with the buffer
contents and reporting any parser and code generation issues.

The handler rolls its own output-matching loop because we have the
(unfortunate) requirement of handling error output that spans multiple
lines.

Unit tests cover both the command callback and handler, and there is
initial documentation for all of the option variables.
 2017-08-30 11:08:06 -07:00
w0rp
0827cb5483 Use two exclamation marks for marking lint file linters, which are easier to see and click 2017-08-28 22:08:55 +01:00
w0rp
8e3c1dbd11 Fix - #883 Document linting behavior better, sync up the lists of supported tools, andautomatically demand that they stay in sync 2017-08-28 22:05:12 +01:00
Michael
8f8d015dae Add pycodestyle Python linter support (#872) 
Add a pycodestyle linter
 2017-08-25 12:46:56 +01:00
Peter Renström
4bea50b82f Add clang-format fixer for C/C++ (#873) 
* Add clang-format fixer for C/C++

* Document clang-format options

* Refer ale-cpp-clangformat to ale-c-clangformat
 2017-08-24 22:49:43 +01:00
w0rp
9d3bda4441 Merge pull request #865 from jez/erubis-linter 
Add erubis linter
 2017-08-22 10:33:08 +01:00
Jake Zimmerman
b356d56448 Add erubis linter 
This linter works largely the same as the existing `erubylint` linter,
except it works with `erubis` instead of `erb` as the driving command.
 2017-08-21 13:51:42 -07:00
w0rp
47e681529b Merge pull request #862 from notomo/add-phpcbf-fixer 
add phpcbf fixer
 2017-08-20 13:42:03 +01:00
Michiel Westerbeek
d646ebda72 Added new linter for GraphQL: gqlint (#863) 
* Added new linter for GraphQL: GQLint

* added help-files
 2017-08-20 13:36:46 +01:00
w0rp
c7193e775e #653 Document the automatic error prompt closing behaviour 2017-08-20 13:35:27 +01:00
tmn-o3
5a9a365aed add phpcbf fixer 2017-08-20 05:47:21 +00:00
w0rp
e5d0a17694 #653 - Explain the new filename key support in the documentation 2017-08-20 00:16:28 +01:00
w0rp
fb0c931b2d Update the documentation to mention the new behaviour for quickfix 2017-08-19 14:35:01 +01:00
w0rp
be4347084e Increase the default maximum completion suggestions to a more useful but safe level, and filter before requesting details, which is faster 2017-08-18 22:34:18 +01:00
w0rp
2365fd2948 Document completion support for ALE, and expand the fixer documentation a little 2017-08-18 00:08:58 +01:00
Scott Bonds
322910dc0b Add linter for Idris (#838) 
* Add linter for Idris

* Fix parsing warnings and column ranges in Idris linter

* Make Idris linter configurable. Fix help tag.
 2017-08-10 21:09:58 +01:00
w0rp
dcf7cbe366 Merge pull request #842 from gfontenot/gf-swiftformat 
Add support for SwiftFormat as a fixer
 2017-08-10 21:06:55 +01:00
w0rp
9ae2df1958 Automatically check for invalid help tag references, and fix some existing documentation issues 2017-08-10 10:45:12 +01:00
w0rp
2dcd2ee4da Fix some broken tag links 2017-08-10 10:14:42 +01:00
Gordon Fontenot
4709e67627
Add support for SwiftFormat as a fixer 
SwiftFormat is a tool that can be used to format Swift files. This commit adds
support for using SwiftFormat as a fixer from ALE. It looks for executables in
the Pods directory, then the Pods directory for a React Native project, then
finally falls back to the globally installed instance if neither of those were
found.

https://github.com/nicklockwood/SwiftFormat
 2017-08-09 12:41:21 -05:00
w0rp
670858f774 Fix #468 - Add a cool down period for when things go wrong 2017-08-09 00:05:55 +01:00
w0rp
ac8cc6d991 Document the extra optional argument for ale#Queue 2017-08-08 23:52:28 +01:00
w0rp
16cfedf04a Fix #271 - Add the ability to open the quickfix or loclist windows only after saving a file 2017-08-08 00:46:42 +01:00
w0rp
2c4700ab7f #517 - Document arguments for defining LSP linters 2017-08-07 13:31:29 +01:00
w0rp
39ebb431b6 Document the PHP langserver integration 2017-08-07 13:08:51 +01:00
w0rp
f7d7abe5b2 Document the rls linter 2017-08-07 13:00:17 +01:00
Andrej Radovic
a767578d44 Added clang-tidy for C, too. 
A limited number of clang-tidy checks can be used with C, too. I pretty much
copied and refactored the C++ clang-tidy linter, and added some documentation
about C-compatible checks.
 2017-08-05 16:42:28 +02:00
Nick James
a3d2fb5688 Add Tcl nagelfar linter 2017-08-02 23:05:19 +01:00
w0rp
235fc90e22 Fix #308 - Check Dart files with dartanalyzer 2017-07-18 23:57:33 +01:00
Matthew Turland
da410caff8 Add yaml swaglint linter (#771) 
* Add yaml swaglint linter
 2017-07-17 20:28:21 +01:00
w0rp
bd5ff5b1e5 Merge pull request #774 from dmitrivereshchagin/syntaxerl-linter 
Add SyntaxErl linter
 2017-07-16 15:06:55 +01:00
Ardis
7d174b0056 Added phpstan linter for php. (#772) 
* Added phpstan linter for php.
 2017-07-16 15:04:25 +01:00
Dmitri Vereshchagin
1aea6a34ff Add SyntaxErl linter 
These changes add [SyntaxErl][1] integration.  SyntaxErl is a syntax
checker tool for Erlang.

[1]: https://github.com/ten0s/syntaxerl
 2017-07-16 15:35:21 +03:00
w0rp
15c48650e7 #739 - Document the end_col and end_lnum keys for the loclist format 2017-07-16 00:40:20 +01:00
w0rp
507e32e91c #764 - Update the documentation to mention how to echo messages with the ALELint autocmd 2017-07-14 00:33:12 +01:00
Kevin Kays
4c50aec79c Add scalastyle linter (#766) 
* Add support for scalastyle

* Add scalastyle docs

* scalastyle support for column numbers

* off by one column

* Add tests for scalastyle command and handler

* update readme for scalastyle

* allow full scalastyle options instead of just config file

* fix indentation

* allow scalastyle config file in parent directories by a couple names.

* check for missing match args with empty

* remove echo

* use a for loop
 2017-07-13 23:41:01 +01:00
Eddie Lebow
bc32e24203 Add rails_best_practices handler (resolves #655) (#751) 
* Move FindRailsRoot() to more general location

* Add rails_best_practices handler (resolves #655)

* Update documentation for rails_best_practices

Also add brakeman to *ale* documentation.

* rails_best_practices: allow overriding the executable

* rails_best_practices: format help correctly

* rails_best_practices: capture tool output on Windows
 2017-07-12 10:43:47 +01:00
Julian Andrews
bbabdd0043 Fix documentation typo 2017-07-11 16:14:18 -06:00
Jake Zimmerman
768f761017 Prefer --fast for stack-build (#754) 
* Vim scripts shouldn't have hyphens

Especially not ones that will be autoloaded. You can't have a hyphen in
a function name, so autoloading functions based on filename will fail.

* Add g:haskell_stack_build_options, default: --fast

If we're going to use the --fast option, we may as well go the whole 9
yards and let the user configure the 'stack build' flags.

* Create documentation for stack-build options
 2017-07-11 13:05:13 +01:00
Jake Zimmerman
b50a7318fb Add new Haskell linter (#742) 
* Add stack-build linter for Haskell

The stack-build linter works better than the other two linters when
you're working with an entire Haskell project. It builds the project
entirely and reports any errors.

The other two Haskell GHC linters only work on single files, which can
result in spurious errors (for example, not being able to find imports).

* Document all available Haskell linters

* Split GHC checkers into separate files
 2017-07-09 22:39:33 +01:00
w0rp
1b55e5edab Fix a syntax error in an example 2017-07-08 22:52:34 +01:00
Andrew Vimmer
4fd5bf81be Added missing statement about <Plug>(ale_toggle) mapping to the documentation (#740) 
* Added missing statement about a `<Plug>` mapping.

* Fixed logical mistake related to "option calling".

* Rectified article usage according to a request.
 2017-07-08 22:10:23 +01:00
w0rp
996732d5a6 Document the virtualenv directories variable in the main file instead 2017-07-08 14:30:12 +01:00
w0rp
7b7a275902 Store the output of commands by default so I don't have to ask people to turn it on any more. 2017-07-04 00:17:13 +01:00
w0rp
a1cf7f67a1 Fix #182 - Add support for lintr 2017-07-03 22:34:30 +01:00
w0rp
84b280b881 Fix #178 - Check Stylus files with stylelint 2017-07-03 16:57:39 +01:00
w0rp
79e8e063af Make pug-lint detect node_modules executables, and add options for pug-lint like the other linters 2017-06-29 11:40:03 +01:00
Tarik Graba
01ecf2a75f Adds an option to pass additional arguments to the verilog/verilator … (#698) 
* Adds an option to pass additional arguments to the verilog/verilator linter

The new otion is g:ale_verilog_verilator_options
+ doc

* Spell check verilog linter doc file

* Add entries to the verilog linters in the doc table of content

* Vader test for verilog/verilator linter args option verilog_verilator_options
 2017-06-29 09:15:52 +01:00
Adam Stankiewicz
7eec1f2efc Add prettier-standard support (#702) 
* Add prettier-standard support

* Update ale-javascript.txt

Remove a duplicated header line.
 2017-06-28 16:35:19 +01:00
w0rp
8846a8860f Use a new window for the ALEFixSuggest command, and document it better 2017-06-28 16:20:05 +01:00
w0rp
499bf63dc3 #678 - Document the sign column color behaviour 2017-06-27 09:44:02 +01:00
w0rp
b9d91f0e9b Document :ALEInfo better 2017-06-26 22:08:55 +01:00
w0rp
d5c9a4eb87 #171 - Document every highlight 2017-06-26 21:49:20 +01:00
Gagbo
dc647fcc7f Add clangcheck Linter to cpp (#686) 
Add a clangcheck linter
 2017-06-24 16:10:04 +01:00
w0rp
1ea61162a0 Fix #687 - Check files on enter if they have changed 2017-06-24 12:24:31 +01:00
w0rp
a105aa90a5 Fix #668 - Support eslint for TypeScript 2017-06-20 10:50:38 +01:00
w0rp
629ff513ec #659 - Add options for Python fixers, and cut down on duplicated documentation 2017-06-18 11:03:31 +01:00
w0rp
f814be45b1 Fix #536 - Implement linter problem type re-mapping 2017-06-14 17:59:13 +01:00