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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct misclassification of .js.erb files #4427

Merged
merged 4 commits into from
May 31, 2019
Merged

Correct misclassification of .js.erb files #4427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c443047
Correct misclassification of .js.erb files
CHTJonas Feb 18, 2019
92b7b6a
Use JavaScript syntax highlighting for JS+ERB
CHTJonas Mar 23, 2019
0c828cd
Merge branch 'upstream/master' into master
CHTJonas Mar 23, 2019
61b1dc7
Merge remote-tracking branch 'upstream/master'
CHTJonas May 27, 2019
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
10 changes: 10 additions & 0 deletions lib/linguist/languages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2409,6 +2409,16 @@ JavaScript:
- v8
- v8-shell
language_id: 183
JavaScript+ERB:
type: programming
tm_scope: source.js
group: JavaScript
extensions:
- ".js.erb"
ace_mode: javascript
codemirror_mode: javascript
codemirror_mime_type: application/javascript
language_id: 914318960
Jison:
type: programming
group: Yacc
Expand Down
1 change: 1 addition & 0 deletions samples/JavaScript+ERB/create.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$("<%= escape_javascript(render @model) %>").appendTo("#models");
1 change: 1 addition & 0 deletions vendor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
- **Java Properties:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
- **Java Server Pages:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
- **JavaScript:** [atom/language-javascript](https://github.com/atom/language-javascript)
- **JavaScript+ERB:** [atom/language-javascript](https://github.com/atom/language-javascript)
- **Jison:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
- **Jison Lex:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
- **Jolie:** [fmontesi/language-jolie](https://github.com/fmontesi/language-jolie)
Expand Down