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/typescript/highlights.scm | 2 +- runtime/queries/typescript/indents.scm | 2 +- runtime/queries/typescript/injections.scm | 2 +- runtime/queries/typescript/textobjects.scm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/queries/typescript') diff --git a/runtime/queries/typescript/highlights.scm b/runtime/queries/typescript/highlights.scm index b89aa8c4..7c15cf3d 100644 --- a/runtime/queries/typescript/highlights.scm +++ b/runtime/queries/typescript/highlights.scm @@ -49,7 +49,7 @@ "readonly" ] @keyword.storage.modifier -; inherits: javascript +; inherits: ecma ; Types diff --git a/runtime/queries/typescript/indents.scm b/runtime/queries/typescript/indents.scm index 055e170b..34db2741 100644 --- a/runtime/queries/typescript/indents.scm +++ b/runtime/queries/typescript/indents.scm @@ -1,4 +1,4 @@ -; inherits: javascript +; inherits: ecma [ (enum_declaration) diff --git a/runtime/queries/typescript/injections.scm b/runtime/queries/typescript/injections.scm index ff0ddfac..04328f09 100644 --- a/runtime/queries/typescript/injections.scm +++ b/runtime/queries/typescript/injections.scm @@ -1 +1 @@ -; inherits: javascript +; inherits: ecma diff --git a/runtime/queries/typescript/textobjects.scm b/runtime/queries/typescript/textobjects.scm index 8564236b..57be8b5f 100644 --- a/runtime/queries/typescript/textobjects.scm +++ b/runtime/queries/typescript/textobjects.scm @@ -1,4 +1,4 @@ -; inherits: javascript +; inherits: ecma [ (interface_declaration -- cgit v1.2.3-70-g09d2