Skip to content

Commit

Permalink
chore(editor files): Improve editor files setup
Browse files Browse the repository at this point in the history
Applying some of the changes made by @cybermerlin. Starting the process of synchronizing our
branches.
  • Loading branch information
Portugal, Marcelo authored and mportuga committed May 11, 2018
1 parent a41677a commit 3252ccd
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
19 changes: 8 additions & 11 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true


[*]

# Change these settings to your own preference
indent_style = space
indent_size = 2

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
indent_brace_style = K&R
curly_bracket_next_line = false
spaces_around_operators = true
max_line_length = 120
tab_width = 2
indent_style = space
indent_size = 2
continuation_indent_size = 4
insert_final_newline = true

[*.md]
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Auto detect text files and perform LF normalization
* text=auto
* text eol=lf

# Custom for Visual Studio
*.cs diff=csharp
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
c#################
#################
## Vim
#################

Expand Down Expand Up @@ -199,4 +199,4 @@ Sauce-Connect.jar
docs
bower_components
.grunt
coverage/
coverage/
8 changes: 6 additions & 2 deletions grunt/jshint.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ module.exports = {
options: {
reporter: require('jshint-stylish'),

curly: true,
eqeqeq: true,
curly: false,
expr: true,
asi: true,
laxbreak: true,
eqeqeq: false,
lastsemic: false,
immed: true,
latedef: false,
newcap: true,
Expand Down

0 comments on commit 3252ccd

Please sign in to comment.