Merge pull request #85 from crystal-lang-tools/keidax/nilable-constants

Support nilable constants

grammar.js

@@ -484,6 +484,7 @@ module.exports = grammar({
       $.self,
       $.constant,
       $.generic_instance_type,
+      $.nilable_constant,
       $.pseudo_constant,
       $.special_variable,
       alias($.global_match_data_index, $.special_variable),
@@ -1569,6 +1570,19 @@ module.exports = grammar({
       ))
     },
 
+    nilable_constant: $ => {
+      const base = choice(
+        $.constant,
+        $.nilable_constant,
+        $.generic_instance_type,
+      )
+
+      return seq(
+        base,
+        token.immediate('?'),
+      )
+    },
+
     pseudo_constant: $ => choice(
       '__LINE__',
       '__END_LINE__',

queries/nvim/highlights.scm

@@ -47,6 +47,12 @@
   "unless"
 ] @keyword.conditional
 
+(conditional
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
 [
   "for"
   "until"
@@ -133,6 +139,12 @@
   (generic_type)
 ] @type
 
+(nilable_constant
+  "?" @type.builtin)
+
+(nilable_type
+  "?" @type.builtin)
+
 (annotation
   (constant) @attribute)