Skip to content

Commit 13566ae

Browse files
authored
Merge pull request arduino-cmake#25 from arduino-cmake/feature/16-define-a-style-standard
Feature/16 define a style standard
2 parents 6bc1c87 + cded35a commit 13566ae

File tree

6 files changed

+118
-21
lines changed

6 files changed

+118
-21
lines changed

Diff for: .editorconfig

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
6+
end_of_line = lf
7+
insert_final_newline = true
8+
9+
indent_style = space
10+
indent_size = 4
11+
# Editor support is limited. Make your you align multiline statements accordingly, should your editor not honour this attribute
12+
continuation_indent_size = 8
13+
14+
trim_trailing_whitespace = true

Diff for: .gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text eol=lf

Diff for: .gitignore

+4-21
Original file line numberDiff line numberDiff line change
@@ -82,27 +82,10 @@ Module.symvers
8282
Mkfile.old
8383
dkms.conf
8484

85-
### JetBrains template
86-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
87-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
88-
89-
# User-specific stuff:
90-
.idea/**/workspace.xml
91-
.idea/**/tasks.xml
92-
.idea/dictionaries
93-
94-
# Sensitive or high-churn files:
95-
.idea/**/dataSources/
96-
.idea/**/dataSources.ids
97-
.idea/**/dataSources.xml
98-
.idea/**/dataSources.local.xml
99-
.idea/**/sqlDataSources.xml
100-
.idea/**/dynamic.xml
101-
.idea/**/uiDesigner.xml
102-
103-
# Gradle:
104-
.idea/**/gradle.xml
105-
.idea/**/libraries
85+
### JetBrains (modified)
86+
.idea/*
87+
!.idea/codeStyleSettings.xml
88+
!.idea/codeStyles/
10689

10790
# CMake
10891
cmake-build-debug/

Diff for: .idea/codeStyleSettings.xml

+50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: .idea/codeStyles/Project.xml

+44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: .idea/codeStyles/codeStyleConfig.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)