Skip to content

Commit 3252ccd

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored andcommitted
chore(editor files): Improve editor files setup
Applying some of the changes made by @cybermerlin. Starting the process of synchronizing our branches.
1 parent a41677a commit 3252ccd

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

Diff for: .editorconfig

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
# EditorConfig helps developers define and maintain consistent
2-
# coding styles between different editors and IDEs
3-
# editorconfig.org
4-
51
root = true
62

7-
83
[*]
9-
10-
# Change these settings to your own preference
11-
indent_style = space
12-
indent_size = 2
13-
14-
# We recommend you to keep these unchanged
154
end_of_line = lf
165
charset = utf-8
176
trim_trailing_whitespace = true
7+
indent_brace_style = K&R
8+
curly_bracket_next_line = false
9+
spaces_around_operators = true
10+
max_line_length = 120
11+
tab_width = 2
12+
indent_style = space
13+
indent_size = 2
14+
continuation_indent_size = 4
1815
insert_final_newline = true
1916

2017
[*.md]

Diff for: .gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto detect text files and perform LF normalization
2-
* text=auto
2+
* text eol=lf
33

44
# Custom for Visual Studio
55
*.cs diff=csharp

Diff for: .gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
c#################
1+
#################
22
## Vim
33
#################
44

@@ -199,4 +199,4 @@ Sauce-Connect.jar
199199
docs
200200
bower_components
201201
.grunt
202-
coverage/
202+
coverage/

Diff for: grunt/jshint.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ module.exports = {
22
options: {
33
reporter: require('jshint-stylish'),
44

5-
curly: true,
6-
eqeqeq: true,
5+
curly: false,
6+
expr: true,
7+
asi: true,
8+
laxbreak: true,
9+
eqeqeq: false,
10+
lastsemic: false,
711
immed: true,
812
latedef: false,
913
newcap: true,

0 commit comments

Comments
 (0)