diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-06-27 09:31:20 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-06-27 13:53:26 +0200 |
| commit | 9bb91af8594885ec0090c8fa9aac4fa19aa20510 (patch) | |
| tree | 75e07a12e89bbf818fe48bd63a14ec8a43aed4cc | |
| parent | fce918ebab9d686946af4d46bc00536eb3dd2f4d (diff) | |
| download | mullvadvpn-9bb91af8594885ec0090c8fa9aac4fa19aa20510.tar.xz mullvadvpn-9bb91af8594885ec0090c8fa9aac4fa19aa20510.zip | |
Add editorconfig configuration
| -rw-r--r-- | .editorconfig | 18 | ||||
| -rw-r--r-- | .gitattributes | 5 | ||||
| -rw-r--r-- | .prettierrc.yml | 4 |
3 files changed, 23 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..353c925e45 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +charset = utf-8 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{rs,sh}] +end_of_line = lf +indent_style = space +indent_size = 4 + +[*.{js,json,css,html}] +indent_style = space +indent_size = 2 diff --git a/.gitattributes b/.gitattributes index 64584601b1..c63c583436 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,8 @@ # Set the default behavior * text=auto -# Do not break script files on Windows (Cygwin gets upset with CRLF) +# Do not break script files on Windows, Bash expects LF *.sh text eol=lf + +# Use LF for Rust because rustfmt works best like that +*.rs text eol=lf diff --git a/.prettierrc.yml b/.prettierrc.yml index 76a9981af2..7e3032aa3f 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -1,12 +1,10 @@ # .prettierrc.yml # see: https://prettier.io/docs/en/options.html printWidth: 100 -tabWidth: 2 semi: true -useTabs: false singleQuote: true trailingComma: all bracketSpacing: true jsxBracketSameLine: true arrowParens: always -proseWrap: always
\ No newline at end of file +proseWrap: always |