feat(queries): modeline mechanism for base langs

This implements https://github.com/neovim/neovim/pull/13059#issuecomment-704414189

This behaves like modelines and remove the use of the base_language map.
Also, this allows to fine-tune what we actually want to include per
query, which is better IMO.

15 files changed, 21 insertions, 0 deletions

diff --git a/queries/cpp/folds.scm b/queries/cpp/folds.scm
index f43412012..131be208a 100644
--- a/queries/cpp/folds.scm
+++ b/queries/cpp/folds.scm
@@ -1,3 +1,5 @@
+; inherits: c
+
 [
  (for_range_loop)
  (class_specifier)
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 30c4b75d2..128ecb9d7 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -1,3 +1,5 @@
+; inherits: c
+
 ((identifier) @field
  (#match? @field "^_"))
 
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
index aa25a4cd8..a109aabdf 100644
--- a/queries/cpp/locals.scm
+++ b/queries/cpp/locals.scm
@@ -1,3 +1,5 @@
+; inherits: c
+
 ;; Parameters
 (variadic_parameter_declaration
   declarator: (variadic_declarator
diff --git a/queries/javascript/folds.scm b/queries/javascript/folds.scm
index 6bc76af85..0b33ba569 100644
--- a/queries/javascript/folds.scm
+++ b/queries/javascript/folds.scm
@@ -1,3 +1,4 @@
+; inherits: (jsx)
 [
   (for_in_statement)
   (for_statement)
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index de505366a..0b6504968 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -1,3 +1,4 @@
+; inherits: (jsx)
 ; Types
 
 ; Javascript
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index 2f501f3a1..99a40a6be 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -1,3 +1,5 @@
+; inherits: (jsx)
+
 ; Scopes
 ;-------
 
diff --git a/queries/ocaml_interface/folds.scm b/queries/ocaml_interface/folds.scm
new file mode 100644
index 000000000..6d3dfbcf2
--- /dev/null
+++ b/queries/ocaml_interface/folds.scm
@@ -0,0 +1 @@
+; inherits: ocaml
diff --git a/queries/ocaml_interface/highlights.scm b/queries/ocaml_interface/highlights.scm
new file mode 100644
index 000000000..6d3dfbcf2
--- /dev/null
+++ b/queries/ocaml_interface/highlights.scm
@@ -0,0 +1 @@
+; inherits: ocaml
diff --git a/queries/ocaml_interface/locals.scm b/queries/ocaml_interface/locals.scm
new file mode 100644
index 000000000..6d3dfbcf2
--- /dev/null
+++ b/queries/ocaml_interface/locals.scm
@@ -0,0 +1 @@
+; inherits: ocaml
diff --git a/queries/tsx/folds.scm b/queries/tsx/folds.scm
new file mode 100644
index 000000000..07391231c
--- /dev/null
+++ b/queries/tsx/folds.scm
@@ -0,0 +1 @@
+; inherits: typescript,jsx
diff --git a/queries/tsx/highlights.scm b/queries/tsx/highlights.scm
new file mode 100644
index 000000000..07391231c
--- /dev/null
+++ b/queries/tsx/highlights.scm
@@ -0,0 +1 @@
+; inherits: typescript,jsx
diff --git a/queries/tsx/locals.scm b/queries/tsx/locals.scm
new file mode 100644
index 000000000..07391231c
--- /dev/null
+++ b/queries/tsx/locals.scm
@@ -0,0 +1 @@
+; inherits: typescript,jsx
diff --git a/queries/typescript/folds.scm b/queries/typescript/folds.scm
index f08395f3a..448f4d12a 100644
--- a/queries/typescript/folds.scm
+++ b/queries/typescript/folds.scm
@@ -1,3 +1,5 @@
+; inherits: javascript
+
 [
   (interface_declaration)
   (internal_module)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index fa7db9d92..87272f98f 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -1,3 +1,4 @@
+; inherits: javascript
 [
 "abstract"
 "declare"
diff --git a/queries/typescript/locals.scm b/queries/typescript/locals.scm
index cb064b823..3e05f536e 100644
--- a/queries/typescript/locals.scm
+++ b/queries/typescript/locals.scm
@@ -1,2 +1,4 @@
+; inherits: javascript
+
 (required_parameter (identifier) @definition)
 (optional_parameter (identifier) @definition)