Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sever relationships between CSON/JSON and parent languages #4345

Merged
merged 2 commits into from
Dec 10, 2018
Merged

Sever relationships between CSON/JSON and parent languages #4345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7d06e0
Sever relationships between CSON/JSON and parents
Alhadis Dec 6, 2018
0db2e19
Fix missing CodeMirror mode for JSONLD files
Alhadis Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/linguist/languages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,12 +594,10 @@ COLLADA:
language_id: 49
CSON:
type: data
group: CoffeeScript
tm_scope: source.coffee
ace_mode: coffee
codemirror_mode: coffeescript
codemirror_mime_type: text/x-coffeescript
searchable: false
extensions:
- ".cson"
language_id: 424
Expand Down Expand Up @@ -2128,7 +2126,6 @@ JFlex:
JSON:
type: data
tm_scope: source.json
group: JavaScript
ace_mode: json
codemirror_mode: javascript
codemirror_mime_type: application/json
Expand Down Expand Up @@ -2197,11 +2194,12 @@ JSON5:
language_id: 175
JSONLD:
type: data
group: JavaScript
ace_mode: javascript
extensions:
- ".jsonld"
tm_scope: source.js
ace_mode: javascript
codemirror_mode: javascript
codemirror_mime_type: application/json
language_id: 176
JSONiq:
color: "#40d47e"
Expand Down