diff --git a/aider/queries/tree-sitter-typescript-tags.scm b/aider/queries/tree-sitter-typescript-tags.scm
index 2e6815342..8a73dccc2 100644
--- a/aider/queries/tree-sitter-typescript-tags.scm
+++ b/aider/queries/tree-sitter-typescript-tags.scm
@@ -1,3 +1,27 @@
+(function_signature
+  name: (identifier) @name.definition.function) @definition.function
+
+(method_signature
+  name: (property_identifier) @name.definition.method) @definition.method
+
+(abstract_method_signature
+  name: (property_identifier) @name.definition.method) @definition.method
+
+(abstract_class_declaration
+  name: (type_identifier) @name.definition.class) @definition.class
+
+(module
+  name: (identifier) @name.definition.module) @definition.module
+
+(interface_declaration
+  name: (type_identifier) @name.definition.interface) @definition.interface
+
+(type_annotation
+  (type_identifier) @name.reference.type) @reference.type
+
+(new_expression
+  constructor: (identifier) @name.reference.class) @reference.class
+
 (function_declaration
   name: (identifier) @name.definition.function) @definition.function