diff --git a/queries/solidity/textobjects.scm b/queries/solidity/textobjects.scm
new file mode 100644
index 00000000..7074815b
--- /dev/null
+++ b/queries/solidity/textobjects.scm
@@ -0,0 +1,154 @@
+; Solidity textobjects
+; Functions
+(function_definition
+  body: (_)) @function.outer
+
+(function_definition
+  body: (_
+    .
+    "{"
+    .
+    (_) @_start @_end
+    (_)? @_end
+    .
+    "}"
+    (#make-range! "function.inner" @_start @_end)))
+
+; Constructors
+(constructor_definition
+  body: (_)) @function.outer
+
+(constructor_definition
+  body: (_
+    .
+    "{"
+    .
+    (_) @_start @_end
+    (_)? @_end
+    .
+    "}"
+    (#make-range! "function.inner" @_start @_end)))
+
+; Modifiers
+(modifier_definition
+  body: (_)) @function.outer
+
+(modifier_definition
+  body: (_
+    .
+    "{"
+    .
+    (_) @_start @_end
+    (_)? @_end
+    .
+    "}"
+    (#make-range! "function.inner" @_start @_end)))
+
+; Contracts
+(contract_declaration
+  body: (_) @class.inner) @class.outer
+
+; Interfaces
+(interface_declaration
+  body: (_) @class.inner) @class.outer
+
+; Libraries
+(library_declaration
+  body: (_) @class.inner) @class.outer
+
+; Structs
+(struct_declaration
+  body: (_) @class.inner) @class.outer
+
+; Loops
+(for_statement
+  body: (_
+    .
+    "{"
+    .
+    (_) @_start @_end
+    (_)? @_end
+    .
+    "}"
+    (#make-range! "loop.inner" @_start @_end))) @loop.outer
+
+(while_statement
+  body: (_
+    .
+    "{"
+    .
+    (_) @_start @_end
+    (_)? @_end
+    .
+    "}"
+    (#make-range! "loop.inner" @_start @_end))) @loop.outer
+
+; Conditionals
+(if_statement
+  consequence: (statement_block) @conditional.inner
+  alternative: (statement_block)? @conditional.inner) @conditional.outer
+
+; Function calls
+(call_expression) @call.outer
+
+(call_expression
+  arguments: (_
+    .
+    "("
+    .
+    (_) @_start
+    (_)? @_end
+    .
+    ")"
+    (#make-range! "call.inner" @_start @_end)))
+
+; Blocks
+(block
+  (_) @block.inner) @block.outer
+
+; Parameters
+(parameter_list
+  ","? @_start
+  .
+  (_) @parameter.inner
+  (#make-range! "parameter.outer" @_start @parameter.inner))
+
+(parameter_list
+  .
+  (_) @parameter.inner
+  .
+  ","? @_end
+  (#make-range! "parameter.outer" @parameter.inner @_end))
+
+; Arguments
+(call_arguments
+  ","? @_start
+  .
+  (_) @parameter.inner
+  (#make-range! "parameter.outer" @_start @parameter.inner))
+
+(call_arguments
+  .
+  (_) @parameter.inner
+  .
+  ","? @_end
+  (#make-range! "parameter.outer" @parameter.inner @_end))
+
+; Comments
+(comment) @comment.outer
+
+; Variable declarations
+(variable_declaration
+  name: (_) @assignment.lhs
+  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
+
+(variable_declaration
+  name: (_) @assignment.inner)
+
+; State variable declarations
+(state_variable_declaration
+  name: (_) @assignment.lhs
+  value: (_) @assignment.inner @assignment.rhs) @assignment.outer
+
+(state_variable_declaration
+  name: (_) @assignment.inner)