From 08b442f4cc962fd83a41754aba41f742acd1e8dc Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Wed, 3 Aug 2022 00:09:44 -0500 Subject: Inherit javascript/typescript from common 'ecma' queries (#3301) JavaScript queries now contain a few lines that prevent them from being used whole-sale in typescript with `; inherits: javascript`. Here we follow nvim-treesitter's way of using a fake 'ecma' language as a common base for JavaScript and TypeScript to share as much as we can.--- runtime/queries/jsx/highlights.scm | 2 +- runtime/queries/jsx/indents.scm | 2 +- runtime/queries/jsx/injections.scm | 2 +- runtime/queries/jsx/locals.scm | 2 +- runtime/queries/jsx/textobjects.scm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'runtime/queries/jsx') diff --git a/runtime/queries/jsx/highlights.scm b/runtime/queries/jsx/highlights.scm index 9be5f517..d7054336 100644 --- a/runtime/queries/jsx/highlights.scm +++ b/runtime/queries/jsx/highlights.scm @@ -1,4 +1,4 @@ -; inherits: javascript +; inherits: ecma ; Highlight component names differently (jsx_opening_element ((identifier) @constructor diff --git a/runtime/queries/jsx/indents.scm b/runtime/queries/jsx/indents.scm index ff0ddfac..04328f09 100644 --- a/runtime/queries/jsx/indents.scm +++ b/runtime/queries/jsx/indents.scm @@ -1 +1 @@ -; inherits: javascript +; inherits: ecma diff --git a/runtime/queries/jsx/injections.scm b/runtime/queries/jsx/injections.scm index ff0ddfac..04328f09 100644 --- a/runtime/queries/jsx/injections.scm +++ b/runtime/queries/jsx/injections.scm @@ -1 +1 @@ -; inherits: javascript +; inherits: ecma diff --git a/runtime/queries/jsx/locals.scm b/runtime/queries/jsx/locals.scm index ff0ddfac..04328f09 100644 --- a/runtime/queries/jsx/locals.scm +++ b/runtime/queries/jsx/locals.scm @@ -1 +1 @@ -; inherits: javascript +; inherits: ecma diff --git a/runtime/queries/jsx/textobjects.scm b/runtime/queries/jsx/textobjects.scm index ff0ddfac..04328f09 100644 --- a/runtime/queries/jsx/textobjects.scm +++ b/runtime/queries/jsx/textobjects.scm @@ -1 +1 @@ -; inherits: javascript +; inherits: ecma -- cgit v1.2.3-70-g09d2