Update

6 files changed, 28 insertions, 16 deletions

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 2c2762eb..a8f7f416 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -6,13 +6,9 @@ endif
 " Vim syntax file
 " Language:        C Additions
 " Original Author: Mikhail Wolfson <mywolfson@gmail.com>
-"                  http://www.vim.org/scripts/script.php?script_id=3064
-" Maintainer:      bfrg <bfrg@users.noreply.github.com>
+" Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 23, 2020
-"
-" Extended C syntax highlighting including highlighting of user-defined
-" functions.
+" Last Change:     Nov 23, 2020
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -63,8 +59,8 @@ hi def link cAnsiName Identifier
 " Highlight all standard C keywords as Statement
 " This is very similar to what other IDEs and editors do
 if get(g:, 'cpp_simple_highlight', 0)
-    hi link cStorageClass Statement
-    hi link cStructure    Statement
-    hi link cTypedef      Statement
-    hi link cLabel        Statement
+    hi! def link cStorageClass Statement
+    hi! def link cStructure    Statement
+    hi! def link cTypedef      Statement
+    hi! def link cLabel        Statement
 endif
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 761a6c15..d181f261 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -8,7 +8,7 @@ endif
 " Original Author: Jon Haggblad <https://github.com/octol>
 " Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 8, 2020
+" Last Change:     Nov 23, 2020
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -201,12 +201,12 @@ hi def link cppSTLvariable     Identifier
 
 " The keywords {inline, virtual, explicit, export, override, final} are
 " standard C++ keywords and NOT types!
-hi link cppModifier Statement
+hi! def link cppModifier Statement
 
 
 " Highlight all standard C++ keywords as Statement
 if get(g:, 'cpp_simple_highlight', 0)
-    hi link cppStructure    Statement
-    hi link cppExceptions   Statement
-    hi link cppStorageClass Statement
+    hi! def link cppStructure    Statement
+    hi! def link cppExceptions   Statement
+    hi! def link cppStorageClass Statement
 endif
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index 3d442332..dafba802 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
@@ -48,7 +52,7 @@ if graphql#has_syntax_group('jsTemplateExpression')
   hi def link graphqlTaggedTemplate jsTaggedTemplate
   hi def link graphqlTemplateExpression jsTemplateExpression
 
-  syn cluster jsExpression add=graphqlTaggedTemplate
+  syn cluster jsExpression add=graphqlTemplateString,graphqlTaggedTemplate
   syn cluster graphqlTaggedTemplate add=graphqlTemplateString
 elseif graphql#has_syntax_group('javaScriptStringT')
   " runtime/syntax/javascript.vim
diff --git a/after/syntax/php/graphql.vim b/after/syntax/php/graphql.vim
index d26de073..3c94bcb8 100644
--- a/after/syntax/php/graphql.vim
+++ b/after/syntax/php/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index f1d8b317..0ef3b1d7 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index e30f0682..df6bf36c 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif