Ignore comments and strings folding

queries/folds.scm

@@ -16,9 +16,4 @@
   (method_declaration)
 ] @fold
 
-[
- (comment)
- (string_literal)
-] @ignore
-
 ; vim: sw=2 foldmethod=marker

queries/highlights.scm

@@ -34,30 +34,25 @@
  "method"
 ] @keyword.method
 
+[
+  "import"
+] @include
+
 [
   "array"
   (break_expression)
-  "do"
   "else"
   "end"
-  "for"
-  "function"
   "if"
-  "import"
   "in"
   "let"
   "of"
-  "primitive"
   "then"
-  "to"
   "type"
   "var"
-  "while"
 
   "class"
   "extends"
-  "method"
-  "new"
 
   "_cast"
   "_chunks"

queries/textobjects.scm

@@ -31,8 +31,9 @@
 ; Class {{{
 (class_declaration
   fields: (_)* @class.inner) @class.outer
-(class_type
+(type_declaration
-  fields: (_)* @class.inner) @class.outer
+ (class_type
+   fields: (_)* @class.inner)) @class.outer
 ; }}}
 
 ; Misc {{{

test/highlight/imports.tig

@@ -1,3 +1,3 @@
 import "lib.tih"
-/* <- keyword */
+/* <- include */
 /*      ^ string.special.path */

test/highlight/keywords.tig

@@ -10,7 +10,7 @@ let
   /* <- keyword.function */
 
   import "lib.tih"
-  /* <- keyword */
+  /* <- include */
 
   type array_of_int = array of int
   /* <- keyword */