From 1a04c79738efe54dc11af67aa52996845655006a Mon Sep 17 00:00:00 2001
From: Kepler Sticka-Jones <kepler+github@stickajones.org>
Date: Mon, 9 May 2016 09:42:09 -0600
Subject: [PATCH] Add ECR (Embedded Crystal) (#2996)

* Add ECR entry from language-crystal

* Add HTML+ECR to Languages.

* Create greeting.erb sample

From the ECR documentation: http://crystal-lang.org/api/ECR.html

* Rename greeting.erb to greeting.ecr

* Rename samples/HTML-ERB/greeting.ecr to samples/HTML-ECR/greeting.ecr

* Update Crystal submodule.

This contains the ECR highlighting.

* Proper named HTML+ECR folder.

The GitHub website just wouldn't do the folder right.

* Add .ecr file extension to ECR
---
 grammars.yml                     |  1 +
 lib/linguist/languages.yml       | 10 ++++++++++
 samples/HTML+ECR/greeting.ecr    |  5 +++++
 vendor/grammars/language-crystal |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 samples/HTML+ECR/greeting.ecr

diff --git a/grammars.yml b/grammars.yml
index a825100a..9140c82f 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -337,6 +337,7 @@ vendor/grammars/language-coffee-script:
 - source.litcoffee
 vendor/grammars/language-crystal:
 - source.crystal
+- text.html.ecr
 vendor/grammars/language-csharp:
 - source.cake
 - source.cs
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 81051979..38f3445b 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1404,6 +1404,16 @@ HTML+Django:
   - html+jinja
   - htmldjango
   ace_mode: django
+  
+HTML+ECR:
+  type: markup
+  tm_scope: text.html.ecr
+  group: HTML
+  aliases:
+  - ecr
+  extensions:
+  - .ecr
+  ace_mode: text
 
 HTML+EEX:
   type: markup
diff --git a/samples/HTML+ECR/greeting.ecr b/samples/HTML+ECR/greeting.ecr
new file mode 100644
index 00000000..3f4709ce
--- /dev/null
+++ b/samples/HTML+ECR/greeting.ecr
@@ -0,0 +1,5 @@
+<% if @name %>
+  Greeting, <%= @name %>!
+<% else %>
+  Greeting!
+<% end %>
diff --git a/vendor/grammars/language-crystal b/vendor/grammars/language-crystal
index f87d6864..ec1e4991 160000
--- a/vendor/grammars/language-crystal
+++ b/vendor/grammars/language-crystal
@@ -1 +1 @@
-Subproject commit f87d68645c9a4243a7942e6b414449f1eec8a3e7
+Subproject commit ec1e4991e6647da9ca2c5337b795700c1f6ee7e4