Improve support for comments in ReasonML lexer (rouge-ruby#1641)

The ReasonML lexer does not properly lex single-line comments (those that begin with `//`) or certain types of multi-line comments. This commit addresses those errors. Co-authored-by: Michael Camilleri <mike@inqk.net>
bpl · Dec 8, 2020 · 19da95a · 19da95a
1 parent da7aa9a
commit 19da95a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/rouge/lexers/reasonml.rb b/lib/rouge/lexers/reasonml.rb
@@ -24,7 +24,8 @@ def self.keywords
         rule %r/#{@@upper_id}(?=\s*[.])/, Name::Namespace, :dotted
         rule %r/`#{@@id}/, Name::Tag
         rule @@upper_id, Name::Class
-        rule %r/[\/][*](?![\/])/, Comment, :comment
+        rule %r(//.*), Comment::Single
+        rule %r(/\*), Comment::Multiline, :comment
         rule @@id do |m|
           match = m[0]
           if self.class.keywords.include? match
@@ -55,10 +56,10 @@ def self.keywords
       end
 
       state :comment do
-        rule %r|[^/*)]+|, Comment
-        rule %r|[/][*]|, Comment, :push
-        rule %r|[*][/]|, Comment, :pop!
-        rule %r|[*/]|, Comment
+        rule %r([^/*]+), Comment::Multiline
+        rule %r(/\*), Comment::Multiline, :comment
+        rule %r(\*/), Comment::Multiline, :pop!
+        rule %r([*/]), Comment::Multiline
       end
     end
   end

diff --git a/spec/visual/samples/reasonml b/spec/visual/samples/reasonml
@@ -1,3 +1,5 @@
+let x = 6 // This is single line comment
+
 let c: char = 'A'; /* comment with link https://example and - = */
 
 let respond_no_content = reqd => {
@@ -43,6 +45,8 @@ let ignore: 'a => unit = _ => ();
 /* comment ****/
 /* comment *****/
 
+// A single line comment
+
 let testingNotQuiteEndOfLineComments = [
   "Item 1" /* Comment For First Item */,
   "Item 2" /* Comment For Second Item */,