From 1aeb3634c1efe10a98d26769807208fb3ade43ef Mon Sep 17 00:00:00 2001 From: aneesh98 Date: Sun, 22 Oct 2023 14:13:50 +0530 Subject: [PATCH 1/2] Makefile String Fix --- src/languages/makefile.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/languages/makefile.js b/src/languages/makefile.js index 569abb1c6f..42af5d1349 100644 --- a/src/languages/makefile.js +++ b/src/languages/makefile.js @@ -38,7 +38,10 @@ export default function(hljs) { + 'word wordlist firstword lastword dir notdir suffix basename ' + 'addsuffix addprefix join wildcard realpath abspath error warning ' + 'shell origin flavor foreach if or and call eval file value' }, - contains: [ VARIABLE ] + contains: [ + VARIABLE, + QUOTE_STRING // Added QUOTE_STRING as they can be a part of functions + ] }; /* Variable assignment */ const ASSIGNMENT = { begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)' }; From 5509a5c13dc232a4da856c069534b15be573a39e Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Sat, 6 Jul 2024 22:54:04 -0400 Subject: [PATCH 2/2] add attribution --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 651c3dcc21..27f9daa563 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,7 +7,7 @@ CAVEATS / POTENTIALLY BREAKING CHANGES Core Grammars: -- Nothing yet. +- fix(makefile) - allow strings inside `$()` expressions [aneesh98][] New Grammars: @@ -24,6 +24,7 @@ Themes: CONTRIBUTORS [Josh Goebel]: https://github.com/joshgoebel +[aneesh98]: https://github.com/aneesh98 ## Version 11.10.0