chore: query formatting

5 files changed, 82 insertions, 63 deletions

diff --git a/queries/firrtl/folds.scm b/queries/firrtl/folds.scm
index 437b2c81c..4c64e644f 100644
--- a/queries/firrtl/folds.scm
+++ b/queries/firrtl/folds.scm
@@ -1,6 +1,6 @@
 [
- (circuit)
- (module)
- (when)
- (else)
+  (circuit)
+  (module)
+  (when)
+  (else)
 ] @fold
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index 5f165eb32..8e078fad2 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -1,30 +1,26 @@
 ; Namespaces
+(circuit
+  (identifier) @module)
 
-(circuit (identifier) @module)
-
-(module (identifier) @module)
+(module
+  (identifier) @module)
 
 ; Types
-
 ((identifier) @type
   (#lua-match? @type "^[A-Z][A-Za-z0-9_$]*$"))
 
 ; Keywords
-
 [
   "circuit"
   "module"
   "extmodule"
-
   "flip"
   "parameter"
   "reset"
   "wire"
-
   "cmem"
   "smem"
   "mem"
-
   "reg"
   "with"
   "mport"
@@ -34,39 +30,32 @@
   "is"
   "invalid"
   "skip"
-
   "infer"
   "read"
   "write"
   "rdwr"
-
   "defname"
 ] @keyword
 
 ; Qualifiers
-
 (qualifier) @type.qualifier
 
 ; Storageclasses
-
 [
   "input"
   "output"
 ] @keyword.storage
 
 ; Conditionals
-
 [
   "when"
   "else"
 ] @keyword.conditional
 
 ; Annotations
-
 (info) @attribute
 
 ; Builtins
-
 [
   "stop"
   "printf"
@@ -89,7 +78,6 @@
 ] @type.builtin
 
 ; Fields
-
 [
   "data-type"
   "depth"
@@ -104,33 +92,44 @@
 ((field_id) @variable.member
   (#set! "priority" 105))
 
-(port (identifier) @variable.member)
+(port
+  (identifier) @variable.member)
 
-(wire (identifier) @variable.member)
+(wire
+  (identifier) @variable.member)
 
-(cmem (identifier) @variable.member)
+(cmem
+  (identifier) @variable.member)
 
-(smem (identifier) @variable.member)
+(smem
+  (identifier) @variable.member)
 
-(memory (identifier) @variable.member)
+(memory
+  (identifier) @variable.member)
 
-(register (identifier) @variable.member)
+(register
+  (identifier) @variable.member)
 
 ; Parameters
+(primitive_operation
+  (identifier) @variable.parameter)
 
-(primitive_operation (identifier) @variable.parameter)
+(mux
+  (identifier) @variable.parameter)
 
-(mux (identifier) @variable.parameter)
-(printf (identifier) @variable.parameter)
-(reset (identifier) @variable.parameter)
-(stop (identifier) @variable.parameter)
+(printf
+  (identifier) @variable.parameter)
 
-; Variables
+(reset
+  (identifier) @variable.parameter)
 
+(stop
+  (identifier) @variable.parameter)
+
+; Variables
 (identifier) @variable
 
 ; Operators
-
 (primop) @keyword.operator
 
 [
@@ -143,7 +142,6 @@
 ] @operator
 
 ; Literals
-
 [
   (uint)
   (number)
@@ -164,14 +162,25 @@
 ] @constant.builtin
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
-
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "<" ">" ] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   ","
@@ -180,7 +189,10 @@
 ] @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
 
-["=>" "<=" "="] @operator
+[
+  "=>"
+  "<="
+  "="
+] @operator
diff --git a/queries/firrtl/indents.scm b/queries/firrtl/indents.scm
index 8bc1e2019..e172e1e81 100644
--- a/queries/firrtl/indents.scm
+++ b/queries/firrtl/indents.scm
@@ -1,9 +1,9 @@
 [
- (circuit)
- (module)
- (memory)
- (when)
- (else)
+  (circuit)
+  (module)
+  (memory)
+  (when)
+  (else)
 ] @indent.begin
 
 [
diff --git a/queries/firrtl/injections.scm b/queries/firrtl/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/firrtl/injections.scm
+++ b/queries/firrtl/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/firrtl/locals.scm b/queries/firrtl/locals.scm
index aa0e294cd..97b7931bf 100644
--- a/queries/firrtl/locals.scm
+++ b/queries/firrtl/locals.scm
@@ -1,38 +1,45 @@
 ; Scopes
-
 [
   (source_file)
   (circuit)
   (module)
-
   (else)
   (when)
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
+(port
+  (identifier) @local.definition.field)
 
-(port (identifier) @local.definition.field)
-
-(wire (identifier) @local.definition.field)
+(wire
+  (identifier) @local.definition.field)
 
-(cmem (identifier) @local.definition.field)
+(cmem
+  (identifier) @local.definition.field)
 
-(smem (identifier) @local.definition.field)
+(smem
+  (identifier) @local.definition.field)
 
-(memory (identifier) @local.definition.field)
+(memory
+  (identifier) @local.definition.field)
 
-(register (identifier) @local.definition.field)
+(register
+  (identifier) @local.definition.field)
 
-(circuit (identifier) @local.definition.namespace)
+(circuit
+  (identifier) @local.definition.namespace)
 
-(module (identifier) @local.definition.namespace)
+(module
+  (identifier) @local.definition.namespace)
 
-(parameter (identifier) @local.definition.parameter)
+(parameter
+  (identifier) @local.definition.parameter)
 
-(rdwr (identifier) @local.definition.var)
+(rdwr
+  (identifier) @local.definition.var)
 
-(node (identifier) @local.definition.var)
+(node
+  (identifier) @local.definition.var)