From c18be14b395e9d61c959a6596375e79140ed8534 Mon Sep 17 00:00:00 2001
From: PyvesB <PyvesDev@gmail.com>
Date: Sun, 22 Nov 2020 11:42:08 +0000
Subject: [PATCH] Standardise grammar metadata

---
 .../grammar/erb.tmLanguage.json               |  3 +-
 .../grammar/gemfile.tmLanguage.json           |  9 +---
 .../grammar/ruby.tmLanguage.json              | 50 ++++++++++++++++---
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/eclipse-solargraph-plugin/grammar/erb.tmLanguage.json b/eclipse-solargraph-plugin/grammar/erb.tmLanguage.json
index 0a1d88c..9467f9b 100644
--- a/eclipse-solargraph-plugin/grammar/erb.tmLanguage.json
+++ b/eclipse-solargraph-plugin/grammar/erb.tmLanguage.json
@@ -1,7 +1,8 @@
 {
+	"version": "https://github.com/rubyide/vscode-ruby/commit/b2bc8560c8bc98f17096792389cfa9d93e4e24eb",
 	"name": "HTML (Ruby - ERB)",
 	"scopeName": "text.html.erb",
-	"fileTypes": ["rhtml", "html.erb"],
+	"fileTypes": ["erb", "rhtml", "rhtm"],
 	"injections": {
 		"text.html.erb - (meta.embedded.block.erb | meta.embedded.line.erb | meta.tag | comment), L:meta.tag, L:source.js.embedded.html": {
 			"patterns": [
diff --git a/eclipse-solargraph-plugin/grammar/gemfile.tmLanguage.json b/eclipse-solargraph-plugin/grammar/gemfile.tmLanguage.json
index 92ec716..f3db6ec 100644
--- a/eclipse-solargraph-plugin/grammar/gemfile.tmLanguage.json
+++ b/eclipse-solargraph-plugin/grammar/gemfile.tmLanguage.json
@@ -1,11 +1,6 @@
 {
-	"information_for_contributors": [
-		"This file has been converted from https://github.com/atom/language-ruby/blob/master/grammars/gemfile.cson",
-		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
-		"Once accepted there, we are happy to receive an update request."
-	],
-	"version": "https://github.com/atom/language-ruby/commit/3cb25d88e1173a29027eb52259415a3f851b8662",
-	"name": "Gemfile",
+	"version": "https://github.com/rubyide/vscode-ruby/commit/b2bc8560c8bc98f17096792389cfa9d93e4e24eb",
+	"name": "Ruby (Gemfile)",
 	"scopeName": "source.ruby.gemfile",
 	"fileTypes": ["Gemfile"],
 	"patterns": [
diff --git a/eclipse-solargraph-plugin/grammar/ruby.tmLanguage.json b/eclipse-solargraph-plugin/grammar/ruby.tmLanguage.json
index d223655..40304d2 100644
--- a/eclipse-solargraph-plugin/grammar/ruby.tmLanguage.json
+++ b/eclipse-solargraph-plugin/grammar/ruby.tmLanguage.json
@@ -1,13 +1,49 @@
 {
-	"information_for_contributors": [
-		"This file has been converted from https://github.com/textmate/ruby.tmbundle/blob/master/Syntaxes/Ruby.plist",
-		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
-		"Once accepted there, we are happy to receive an update request."
-	],
-	"version": "https://github.com/textmate/ruby.tmbundle/commit/8d525dd4a0b77ae041593ff26dc883a694c648c5",
+	"version": "https://github.com/microsoft/vscode/commit/3f1f36333d3453f67a36b6bfb1206e9159e9c4f0",
 	"name": "Ruby",
 	"scopeName": "source.ruby",
-	"comment": "\n\tTODO: unresolved issues\n\n\ttext:\n\t\"p <<end\n\tprint me!\n\tend\"\n\tsymptoms:\n\tnot recognized as a heredoc\n\tsolution:\n\tthere is no way to distinguish perfectly between the << operator and the start\n\tof a heredoc. Currently, we require assignment to recognize a heredoc. More\n\trefinement is possible.\n\t• Heredocs with indented terminators (<<-) are always distinguishable, however.\n\t• Nested heredocs are not really supportable at present\n\n\ttext:\n\tprint <<-'THERE' \n\tThis is single quoted. \n\tThe above used #{Time.now} \n\tTHERE \n\tsymtoms:\n\tFrom Programming Ruby p306; should be a non-interpolated heredoc.\n\t\n    text:\n    val?(a):p(b)\n    val?'a':'b'\n    symptoms:\n    ':p' is recognized as a symbol.. its 2 things ':' and 'p'.\n    :'b' has same problem.\n    solution:\n    ternary operator rule, precedence stuff, symbol rule.\n    but also consider 'a.b?(:c)' ??\n",
+	"fileTypes": [
+		"arb",
+		"builder",
+		"cgi",
+		"fcgi",
+		"gemspec",
+		"god",
+		"irbrc",
+		"jbuilder",
+		"mspec",
+		"pluginspec",
+		"podspec",
+		"capfile",
+		"pryrc",
+		"rabl",
+		"rake",
+		"rb",
+		"rbuild",
+		"rbw",
+		"rbx",
+		"rjs",
+		"ru",
+		"ruby",
+		"spec",
+		"thor",
+		"watchr",
+		"Appfile",
+		"Appraisals",
+		"Berksfile",
+		"Brewfile",
+		"Capfile",
+		"Deliverfile",
+		"Fastfile",
+		"Guardfile",
+		"Podfile",
+		"Puppetfile",
+		"Rakefile",
+		"Snapfile",
+		"Thorfile",
+		"Vagrantfile",
+		"Dangerfile"
+	],
 	"patterns": [
 		{
 			"captures": {