diff --git a/eclipse-solargraph-plugin/grammar/erb.tmLanguage.json b/eclipse-solargraph-plugin/grammar/erb.tmLanguage.json
new file mode 100644
index 0000000..0a1d88c
--- /dev/null
+++ b/eclipse-solargraph-plugin/grammar/erb.tmLanguage.json
@@ -0,0 +1,151 @@
+{
+	"name": "HTML (Ruby - ERB)",
+	"scopeName": "text.html.erb",
+	"fileTypes": ["rhtml", "html.erb"],
+	"injections": {
+		"text.html.erb - (meta.embedded.block.erb | meta.embedded.line.erb | meta.tag | comment), L:meta.tag, L:source.js.embedded.html": {
+			"patterns": [
+				{
+					"begin": "(^\\s*)(?=<%+#(?![^%]*%>))",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.whitespace.comment.leading.erb"
+						}
+					},
+					"end": "(?!\\G)(\\s*$\\n)?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.whitespace.comment.trailing.erb"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#comment"
+						}
+					]
+				},
+				{
+					"begin": "(^\\s*)(?=<%(?![^%]*%>))",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.whitespace.embedded.leading.erb"
+						}
+					},
+					"end": "(?!\\G)(\\s*$\\n)?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.whitespace.embedded.trailing.erb"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#tags"
+						}
+					]
+				},
+				{
+					"include": "#comment"
+				},
+				{
+					"include": "#tags"
+				}
+			]
+		}
+	},
+	"patterns": [
+		{
+			"include": "text.html.basic"
+		}
+	],
+	"repository": {
+		"comment": {
+			"patterns": [
+				{
+					"begin": "<%+#",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.begin.erb"
+						}
+					},
+					"end": "%>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.end.erb"
+						}
+					},
+					"name": "comment.block.erb"
+				}
+			]
+		},
+		"tags": {
+			"patterns": [
+				{
+					"begin": "<%+(?!>)[-=]?(?![^%]*%>)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.embedded.begin.erb"
+						}
+					},
+					"contentName": "source.ruby.embedded.erb",
+					"end": "-?%>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.embedded.end.erb"
+						},
+						"1": {
+							"name": "source.ruby"
+						}
+					},
+					"name": "meta.embedded.block.erb",
+					"patterns": [
+						{
+							"captures": {
+								"1": {
+									"name": "punctuation.definition.comment.erb"
+								}
+							},
+							"match": "(#).*?(?=-?%>)",
+							"name": "comment.line.number-sign.erb"
+						},
+						{
+							"include": "source.ruby"
+						}
+					]
+				},
+				{
+					"begin": "<%+(?!>)[-=]?",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.embedded.begin.erb"
+						}
+					},
+					"contentName": "source.ruby.embedded.erb",
+					"end": "-?%>",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.embedded.end.erb"
+						},
+						"1": {
+							"name": "source.ruby"
+						}
+					},
+					"name": "meta.embedded.line.erb",
+					"patterns": [
+						{
+							"captures": {
+								"1": {
+									"name": "punctuation.definition.comment.erb"
+								}
+							},
+							"match": "(#).*?(?=-?%>)",
+							"name": "comment.line.number-sign.erb"
+						},
+						{
+							"include": "source.ruby"
+						}
+					]
+				}
+			]
+		}
+	}
+}
diff --git a/eclipse-solargraph-plugin/icon/erb-editor.png b/eclipse-solargraph-plugin/icon/erb-editor.png
new file mode 100644
index 0000000..5f9510a
Binary files /dev/null and b/eclipse-solargraph-plugin/icon/erb-editor.png differ
diff --git a/eclipse-solargraph-plugin/language-configuration/erb-configuration.json b/eclipse-solargraph-plugin/language-configuration/erb-configuration.json
new file mode 100644
index 0000000..91a7600
--- /dev/null
+++ b/eclipse-solargraph-plugin/language-configuration/erb-configuration.json
@@ -0,0 +1,31 @@
+{
+	"comments": {
+		"blockComment": [ "<%#", "%>" ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["<", ">"]
+	],
+	"autoClosingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"],
+		["`", "`"],
+		["<", ">"],
+		["%", "%"]
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["\"", "\""],
+		["'", "'"],
+		["`", "`"],
+		["<", ">"],
+		["%", "%"]
+	]
+}
diff --git a/eclipse-solargraph-plugin/language-configuration/language-configuration.json b/eclipse-solargraph-plugin/language-configuration/ruby-configuration.json
similarity index 100%
rename from eclipse-solargraph-plugin/language-configuration/language-configuration.json
rename to eclipse-solargraph-plugin/language-configuration/ruby-configuration.json
diff --git a/eclipse-solargraph-plugin/plugin.xml b/eclipse-solargraph-plugin/plugin.xml
index 792077d..05323ed 100644
--- a/eclipse-solargraph-plugin/plugin.xml
+++ b/eclipse-solargraph-plugin/plugin.xml
@@ -31,6 +31,13 @@
            name="Gemfile"
            priority="high">
      </content-type>
+     <content-type
+           base-type="org.eclipse.core.runtime.text"
+           file-extensions="erb,rhtml,rhtm"
+           id="io.github.pyvesb.eclipse_solargraph.erb"
+           name="Embedded Ruby"
+           priority="high">
+     </content-type>
    </extension>
    <extension
          point="org.eclipse.ui.editors">
@@ -42,6 +49,10 @@
             contentTypeId="io.github.pyvesb.eclipse_solargraph.gemfile"
             editorId="org.eclipse.ui.genericeditor.GenericEditor">
       </editorContentTypeBinding>
+      <editorContentTypeBinding
+            contentTypeId="io.github.pyvesb.eclipse_solargraph.erb"
+            editorId="org.eclipse.ui.genericeditor.GenericEditor">
+      </editorContentTypeBinding>
    </extension>
    <extension
          point="org.eclipse.lsp4e.languageServer">
@@ -58,6 +69,10 @@
             contentType="io.github.pyvesb.eclipse_solargraph.gemfile"
             id="io.github.pyvesb.eclipse_solargraph">
          </contentTypeMapping>
+         <contentTypeMapping
+            contentType="io.github.pyvesb.eclipse_solargraph.erb"
+            id="io.github.pyvesb.eclipse_solargraph">
+         </contentTypeMapping>
    </extension>
    <extension
          point="org.eclipse.tm4e.registry.grammars">
@@ -69,6 +84,10 @@
             path="grammar/gemfile.tmLanguage.json"
             scopeName="source.ruby.gemfile">
       </grammar>
+      <grammar
+            path="grammar/erb.tmLanguage.json"
+            scopeName="text.html.erb">
+      </grammar>
       <scopeNameContentTypeBinding
             contentTypeId="io.github.pyvesb.eclipse_solargraph"
             scopeName="source.ruby">
@@ -77,6 +96,10 @@
             contentTypeId="io.github.pyvesb.eclipse_solargraph.gemfile"
             scopeName="source.ruby.gemfile">
       </scopeNameContentTypeBinding>
+      <scopeNameContentTypeBinding
+            contentTypeId="io.github.pyvesb.eclipse_solargraph.erb"
+            scopeName="text.html.erb">
+      </scopeNameContentTypeBinding>
    </extension>
    <extension
          point="org.eclipse.ui.genericeditor.presentationReconcilers">
@@ -88,6 +111,10 @@
             class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
             contentType="io.github.pyvesb.eclipse_solargraph.gemfile">
       </presentationReconciler>
+      <presentationReconciler
+            class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
+            contentType="io.github.pyvesb.eclipse_solargraph.erb">
+      </presentationReconciler>
    </extension>
    <extension
          point="org.eclipse.ui.genericeditor.icons">
@@ -99,16 +126,24 @@
             icon="icon/ruby-editor.png"
             contentType="io.github.pyvesb.eclipse_solargraph.gemfile">
       </icon>
+      <icon
+            icon="icon/erb-editor.png"
+            contentType="io.github.pyvesb.eclipse_solargraph.erb">
+      </icon>
    </extension>
    <extension
          point="org.eclipse.tm4e.languageconfiguration.languageConfigurations">
       <languageConfiguration
             contentTypeId="io.github.pyvesb.eclipse_solargraph"
-            path="language-configuration/language-configuration.json">
+            path="language-configuration/ruby-configuration.json">
       </languageConfiguration>
       <languageConfiguration
             contentTypeId="io.github.pyvesb.eclipse_solargraph.gemfile"
-            path="language-configuration/language-configuration.json">
+            path="language-configuration/ruby-configuration.json">
+      </languageConfiguration>
+      <languageConfiguration
+            contentTypeId="io.github.pyvesb.eclipse_solargraph.erb"
+            path="language-configuration/erb-configuration.json">
       </languageConfiguration>
    </extension>
    <extension
@@ -123,6 +158,11 @@
             path="snippet/Gemfile"
             scopeName="source.ruby.gemfile">
       </snippet>
+      <snippet
+            name="Embedded Ruby sample"
+            path="snippet/sample.erb"
+            scopeName="text.html.erb">
+      </snippet>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
diff --git a/eclipse-solargraph-plugin/snippet/sample.erb b/eclipse-solargraph-plugin/snippet/sample.erb
new file mode 100644
index 0000000..46ed635
--- /dev/null
+++ b/eclipse-solargraph-plugin/snippet/sample.erb
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <p>Hello, <%= user.first_name %>.</p>
+  </body>
+</html>