Skip to content

Commit

Permalink
Add EditorConfig file and language sub-entry (#4421)
Browse files Browse the repository at this point in the history
* Add language sub-entry for EditorConfig files

* Add EditorConfig file for Linguist
  • Loading branch information
Alhadis authored Mar 2, 2019
1 parent 2e6c829 commit 981882c
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 1 deletion.
29 changes: 29 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{h,c}]
indent_style = tab
indent_size = 8

[{Dockerfile,Makefile,*.go}]
indent_style = tab
indent_size = 4

# Ignore fixtures and vendored files
[{grammars,test/fixtures,samples,vendor}/**]
charset = unset
end_of_line = unset
indent_size = unset
indent_style = unset
insert_final_newline = unset
trim_trailing_spaces = unset
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@
[submodule "vendor/grammars/assembly"]
path = vendor/grammars/assembly
url = https://github.com/nanoant/assembly.tmbundle
[submodule "vendor/grammars/atom-editorconfig"]
path = vendor/grammars/atom-editorconfig
url = https://github.com/sindresorhus/atom-editorconfig
[submodule "vendor/grammars/atom-firestore-grammar"]
path = vendor/grammars/atom-firestore-grammar
url = https://github.com/jaysquared/atom-firestore-grammar
Expand Down
2 changes: 2 additions & 0 deletions grammars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ vendor/grammars/asp.tmbundle:
vendor/grammars/assembly:
- objdump.x86asm
- source.x86asm
vendor/grammars/atom-editorconfig:
- source.editorconfig
vendor/grammars/atom-firestore-grammar:
- source.firestore
vendor/grammars/atom-fsharp:
Expand Down
13 changes: 12 additions & 1 deletion lib/linguist/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,18 @@ Ecere Projects:
codemirror_mode: javascript
codemirror_mime_type: application/json
language_id: 98
EditorConfig:
type: data
group: INI
filenames:
- ".editorconfig"
aliases:
- editor-config
ace_mode: ini
codemirror_mode: properties
codemirror_mime_type: text/x-properties
tm_scope: source.editorconfig
language_id: 96139566
Edje Data Collection:
type: data
extensions:
Expand Down Expand Up @@ -2063,7 +2075,6 @@ INI:
- ".pro"
- ".properties"
filenames:
- ".editorconfig"
- buildozer.spec
tm_scope: source.ini
aliases:
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions vendor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **eC:** [ecere/ec.tmbundle](https://github.com/ecere/ec.tmbundle)
- **Ecere Projects:** [textmate/json.tmbundle](https://github.com/textmate/json.tmbundle)
- **ECLiPSe:** [alnkpa/sublimeprolog](https://github.com/alnkpa/sublimeprolog)
- **EditorConfig:** [sindresorhus/atom-editorconfig](https://github.com/sindresorhus/atom-editorconfig)
- **Edje Data Collection:** [textmate/json.tmbundle](https://github.com/textmate/json.tmbundle)
- **edn:** [atom/language-clojure](https://github.com/atom/language-clojure)
- **Eiffel:** [textmate/eiffel.tmbundle](https://github.com/textmate/eiffel.tmbundle)
Expand Down
1 change: 1 addition & 0 deletions vendor/grammars/atom-editorconfig
Submodule atom-editorconfig added at a9c106
27 changes: 27 additions & 0 deletions vendor/licenses/grammar/atom-editorconfig.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
type: grammar
name: atom-editorconfig
version: a9c106673557bb32c83801dd4fdfeef85123cb7b
license: mit
---
The MIT License (MIT)

Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

0 comments on commit 981882c

Please sign in to comment.