Consistent Ruby method highlighting (#1523)

Ruby methods might or might be called in C-style creating inconsistent highlighting.
This highlights only method definitions and removes the highlighting of C-style-invoked methods.

components/prism-ruby.js

@@ -27,6 +27,8 @@
 		}
 	};
 
+	delete Prism.languages.ruby.function;
+
 	Prism.languages.insertBefore('ruby', 'keyword', {
 		'regex': [
 			{
@@ -75,6 +77,14 @@
 		'symbol': {
 			pattern: /(^|[^:]):[a-zA-Z_]\w*(?:[?!]|\b)/,
 			lookbehind: true
+		},
+		'method-definition': {
+			pattern: /(\bdef\s+)[\w.]+/,
+			lookbehind: true,
+			inside: {
+				'function': /\w+$/,
+				rest: Prism.languages.ruby
+			}
 		}
 	});
 
@@ -128,4 +138,4 @@
 			}
 		}
 	];
-}(Prism));
+}(Prism));

tests/languages/crystal/attribute_feature.test

@@ -11,7 +11,7 @@
 	]],
 	["attribute", [
 		["delimiter", "@["],
-		["function", "CallConvention"], ["punctuation", "("], ["string", [ "\"X86_StdCall\"" ]], ["punctuation", ")"],
+		["constant", "CallConvention"], ["punctuation", "("], ["string", [ "\"X86_StdCall\"" ]], ["punctuation", ")"],
 		["delimiter", "]"]
 	]]
 ]

tests/languages/crystal/keyword_feature.test

@@ -1,6 +1,7 @@
 abstract alias as asm begin break case
 class;
-def do else elsif
+def;
+do else elsif
 end ensure enum extend for fun
 if include instance_sizeof
 .is_a?
@@ -17,7 +18,8 @@ __FILE__ __LINE__
 [
 	["keyword", "abstract"], ["keyword", "alias"], ["keyword", "as"], ["keyword", "asm"], ["keyword", "begin"], ["keyword", "break"], ["keyword", "case"],
 	["keyword", "class"], ["punctuation", ";"],
-	["keyword", "def"], ["keyword", "do"], ["keyword", "else"], ["keyword", "elsif"],
+	["keyword", "def"],  ["punctuation", ";"],
+	["keyword", "do"], ["keyword", "else"], ["keyword", "elsif"],
 	["keyword", "end"], ["keyword", "ensure"], ["keyword", "enum"], ["keyword", "extend"], ["keyword", "for"], ["keyword", "fun"],
 	["keyword", "if"], ["keyword", "include"], ["keyword", "instance_sizeof"],
 	["punctuation", "."], ["keyword", "is_a?"],

tests/languages/erb/erb_in_markup_feature.test

@@ -19,7 +19,7 @@ ___ERB1___<%= 1 %>___ERB2___<%= 2 %>
 				["punctuation", "."],
 				"now",
 				["punctuation", "."],
-				["function", "strftime"],
+				"strftime",
 				["punctuation", "("],
 				["string", ["'%A'"]],
 				["punctuation", ")"],
@@ -45,4 +45,4 @@ ___ERB1___<%= 1 %>___ERB2___<%= 2 %>
 
 ----------------------------------------------------
 
-Checks for ERB inside Markup
+Checks for ERB inside Markup

tests/languages/haml/tag_feature.test

@@ -105,7 +105,7 @@
 		"%html",
 		["attributes", [
 			["punctuation", "{"],
-			["function", "html_attrs"],
+			"html_attrs",
 			["punctuation", "("],
 			["string", ["'fr-fr'"]],
 			["punctuation", ")"],
@@ -158,4 +158,4 @@
 
 Checks for tags: basic element names, attributes, html-style attributes,
 attribute methods, boolean attributes, class and id shortcuts,
-implicit div elements, empty tags and whitespace removal.
+implicit div elements, empty tags and whitespace removal.

tests/languages/ruby/keyword_feature.test

@@ -5,7 +5,7 @@ begin
 break
 case
 class;
-def
+def;
 define_method
 defined
 do
@@ -56,7 +56,7 @@ yield
 	["keyword", "break"],
 	["keyword", "case"],
 	["keyword", "class"], ["punctuation", ";"],
-	["keyword", "def"],
+	["keyword", "def"], ["punctuation", ";"],
 	["keyword", "define_method"],
 	["keyword", "defined"],
 	["keyword", "do"],
@@ -100,4 +100,4 @@ yield
 
 ----------------------------------------------------
 
-Checks for all keywords.
+Checks for all keywords.

tests/languages/ruby/method_definition_feature.test

@@ -0,0 +1,82 @@
+class Circle
+  def self.of_diameter(diameter)
+    new diameter / 2
+  end
+
+  def initialize(radius)
+    @radius = radius
+  end
+
+  def circumference
+    Math::PI * radius ** 2
+  end
+
+  # Seattle style
+  def grow_by factor:
+    @radius = @radius * factor
+  end
+end
+
+----------------------------------------------------
+
+[
+  ["keyword", "class"],
+  ["class-name", ["Circle"]],
+  ["keyword", "def"],
+  ["method-definition", [
+    ["keyword", "self"],
+    ["punctuation", "."],
+    ["function", "of_diameter"]
+  ]],
+  ["punctuation", "("],
+  "diameter",
+  ["punctuation", ")"],
+  ["keyword", "new"],
+  ["class-name", ["diameter"]],
+  ["operator", "/"],
+  ["number", "2"],
+  ["keyword", "end"],
+  ["keyword", "def"],
+  ["method-definition", [
+    ["function", "initialize"]
+  ]],
+  ["punctuation", "("],
+  "radius",
+  ["punctuation", ")"],
+  ["variable", "@radius"],
+  ["operator", "="],
+  " radius\n  ",
+  ["keyword", "end"],
+  ["keyword", "def"],
+  ["method-definition", [
+    ["function", "circumference"]
+  ]],
+  ["constant", "Math"],
+  ["punctuation", ":"],
+  ["punctuation", ":"],
+  ["constant", "PI"],
+  ["operator", "*"],
+  " radius ",
+  ["operator", "*"],
+  ["operator", "*"],
+  ["number", "2"],
+  ["keyword", "end"],
+  ["comment", "# Seattle style"],
+  ["keyword", "def"],
+  ["method-definition", [
+    ["function", "grow_by"]
+  ]],
+  " factor",
+  ["punctuation", ":"],
+  ["variable", "@radius"],
+  ["operator", "="],
+  ["variable", "@radius"],
+  ["operator", "*"],
+  " factor\n  ",
+  ["keyword", "end"],
+  ["keyword", "end"]
+]
+
+----------------------------------------------------
+
+Checks that method definitions are highlighted correctly