diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index c5027b5..ce61fcb 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -1,16 +1,19 @@
 (template_body) @local.scope
 (lambda_expression) @local.scope
-
+(block) @local.scope
 
 (function_declaration
-      name: (identifier) @local.definition) @local.scope
+      name: (identifier) @local.definition)
 
 (function_definition
-      name: (identifier) @local.definition)
+      name: (identifier) @local.definition) @local.scope
 
 (parameter
   name: (identifier) @local.definition)
 
+(class_parameter
+  name: (identifier) @local.definition)
+
 (binding
   name: (identifier) @local.definition)
 
diff --git a/test/highlight/parameter_scope.scala b/test/highlight/parameter_scope.scala
new file mode 100644
index 0000000..36719d6
--- /dev/null
+++ b/test/highlight/parameter_scope.scala
@@ -0,0 +1,9 @@
+def meth_with_params(localParam: Int) {
+  var ref_param = c"$localParam $meth_with_params"
+//                   ^parameter
+//                               ^method
+}
+var okay1 = s"hello"
+var okay = c"$localParam $okay1"
+//            ^none
+//                        ^variable