Fix rule for class and module keywords. Class and module methods no l…

…onger highlights as class and module keywords. Add tests.
textmate · Feb 17, 2020 · eb56066 · eb56066
1 parent 2aeab7b
commit eb56066
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Syntaxes/Ruby.plist b/Syntaxes/Ruby.plist
@@ -106,7 +106,7 @@
 	<array>
 		<dict>
 			<key>begin</key>
-			<string>\b(class)\b</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\b(class)\b(?![?!])</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -223,7 +223,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>\b(module)\b</string>
+			<string>(?&lt;!^\.|[^.]\.|::)\b(module)\b(?![?!])</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>

diff --git a/Tests/end_distinction.rb b/Tests/end_distinction.rb
@@ -21,8 +21,23 @@ class Foo
   @@module = "mymodule"
   class_name = "class_name"
   module_name = "module_name"
+  self.class.methods
+  self::class::methods
+
+  def module
+    nil
+  end
+
+  def class
+    nil
+  end
 end
 
+Foo.new.module
+Foo.new::module
+Foo.new.class
+Foo.new::class
+
 # -------------------------------------------
 # Testarea for classes
 # -------------------------------------------