diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index 56c629f4e..cb5c5c8d0 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -1,10 +1,23 @@
 ; CREDITS @maxbrunsfeld (maxbrunsfeld@gmail.com)
 
+;(class_declaration
+;  name: (identifier) @name) @class
+;
+;(method_declaration
+;  name: (identifier) @name) @method
+;
+;(method_invocation
+;  name: (identifier) @name) @call
+
+(class_declaration) @scope
+(method_declaration) @scope
+(if_statement) @scope
+(for_statement) @scope
+(try_statement
+  body: (_) @scope)
+(catch_clause) @scope
+
 (class_declaration
-  name: (identifier) @name) @class
-
+  name: (identifier) @definition.type)
 (method_declaration
-  name: (identifier) @name) @method
-
-(method_invocation
-  name: (identifier) @name) @call
+  name: (identifier) @definition.method)