fix for type-parameter-constraints-clauses (C# scanner)

ganaware · ganaware · commit c21482415be1 · 2015-08-24T11:29:45.000+09:00
diff --git a/lib/coderay/scanners/csharp.rb b/lib/coderay/scanners/csharp.rb
@@ -64,6 +64,7 @@ def scan_tokens encoder, options
       case_expected = false
       label_expected_before_preproc_line = nil
       in_preproc_line = false
+      in_type_parameter_constraints_clauses = false
 
       until eos?
 
@@ -91,6 +92,9 @@ def scan_tokens encoder, options
               label_expected = true if match == ':'
               case_expected = false
             end
+            if match !~ /^[(),.:?\[\]<>]+$/
+              in_type_parameter_constraints_clauses = false
+            end
             encoder.text_token match, :operator
 
           elsif match = scan(/ @?[A-Za-z_][A-Za-z_0-9]* /x)
@@ -102,8 +106,12 @@ def scan_tokens encoder, options
               label_expected = false
               if kind == :keyword
                 case match
+                when 'where'
+                  in_type_parameter_constraints_clauses = true
                 when 'class', 'interface', 'struct'
-                  state = :class_name_expected
+                  if !in_type_parameter_constraints_clauses
+                    state = :class_name_expected
+                  end
                 when 'case', 'default'
                   case_expected = true
                 end
