From 9c1fa94a64446efa671bf5a0abc7f384ea7dd6d2 Mon Sep 17 00:00:00 2001
From: Aleksandar Misich <aleksmsd@gmail.com>
Date: Mon, 5 Aug 2019 04:52:34 -0700
Subject: [PATCH 1/2] Improve block parameters support, don't overwrite scope
 with source.ruby rules

---
 syntaxes/ruby.cson.json | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/syntaxes/ruby.cson.json b/syntaxes/ruby.cson.json
index 3472a8cc8..d5b4996a2 100644
--- a/syntaxes/ruby.cson.json
+++ b/syntaxes/ruby.cson.json
@@ -243,7 +243,7 @@
 		},
 		{
 			"match": "\\b[_A-Z]\\w*\\b",
-			"name": "variable.other.constant.ruby"
+			"name": ""
 		},
 		{
 			"begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\s+\n(\n  (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n  (?>                               # method name\n    [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n    |\n    ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n\\s*(\\()",
@@ -2064,6 +2064,7 @@
 		},
 		{
 			"begin": "(?<={|{\\s|[^A-Za-z0-9_]do|^do|[^A-Za-z0-9_]do\\s|^do\\s)(\\|)",
+			"name": "meta.block.parameters.ruby",
 			"captures": {
 				"1": {
 					"name": "punctuation.separator.variable.ruby"
@@ -2072,11 +2073,24 @@
 			"end": "(?<!\\|)(\\|)(?!\\|)",
 			"patterns": [
 				{
-					"include": "source.ruby"
-				},
-				{
-					"match": "[_a-zA-Z][_a-zA-Z0-9]*",
-					"name": "variable.other.block.ruby"
+					"begin": "(?![\\s,|(])",
+					"end": "(?=,|\\|\\s*)",
+					"patterns": [
+						{
+							"match": "\\G([&*]?)([a-zA-Z][\\w_]*)|(_[\\w_]*)",
+							"captures": {
+								"1": {
+									"name": "storage.type.variable.ruby"
+								},
+								"2": {
+									"name": "variable.other.block.ruby"
+								},
+								"3": {
+									"name": "variable.other.block.unused.ruby variable.other.constant.ruby"
+								}
+							}
+						}
+					]
 				},
 				{
 					"match": ",",
@@ -2201,7 +2215,7 @@
 			]
 		},
 		{
-			"comment": "This is kindof experimental. There really is no way to perfectly match all regular variables, but you can pretty well assume that any normal word in certain curcumstances that havnt already been scoped as something else are probably variables, and the advantages beat the potential errors",
+			"comment": "This is kindof experimental. There really is no way to perfectly match all regular variables, but you can pretty well assume that any normal word in certain curcumstances that haven't already been scoped as something else are probably variables, and the advantages beat the potential errors",
 			"match": "((?<=\\W)\\b|^)\\w+\\b(?=\\s*([\\]\\)\\}\\=\\+\\-\\*\\/\\^\\$\\,\\.]|<\\s|<<[\\s|\\.]))",
 			"name": "variable.other.ruby"
 		}
@@ -2723,4 +2737,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}

From e473003f8fb6b76161ac6848b83dd63db74e9721 Mon Sep 17 00:00:00 2001
From: Aleksandar Misich <aleksmsd@gmail.com>
Date: Mon, 5 Aug 2019 04:56:26 -0700
Subject: [PATCH 2/2] Put back something that was removed for testing.

---
 syntaxes/ruby.cson.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntaxes/ruby.cson.json b/syntaxes/ruby.cson.json
index d5b4996a2..c0bfeae39 100644
--- a/syntaxes/ruby.cson.json
+++ b/syntaxes/ruby.cson.json
@@ -243,7 +243,7 @@
 		},
 		{
 			"match": "\\b[_A-Z]\\w*\\b",
-			"name": ""
+			"name": "variable.other.constant.ruby"
 		},
 		{
 			"begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\s+\n(\n  (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n  (?>                               # method name\n    [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n    |\n    ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n\\s*(\\()",