From f20811eac4a6c37ce1eb0a1d28440dd8ac4f3cd9 Mon Sep 17 00:00:00 2001 From: Reid Vandewiele Date: Fri, 3 Nov 2023 11:03:28 -0700 Subject: [PATCH] Bash: add support for hyphenated param names Previously, a parameter (flag) such as `curl --upload-file` would not be properly recognized, because of the hyphen in the parameter name. This commit causes `--upload-file` to be properly recognized as a parameter. fixes #3569, fixes #3696 --- components/prism-bash.js | 2 +- tests/languages/bash/parameter_feature.test | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/prism-bash.js b/components/prism-bash.js index 6d2e3815c2..ea6b97b3fb 100644 --- a/components/prism-bash.js +++ b/components/prism-bash.js @@ -115,7 +115,7 @@ }, // Highlight parameter names as variables 'parameter': { - pattern: /(^|\s)-{1,2}(?:\w+:[+-]?)?\w+(?:\.\w+)*(?=[=\s]|$)/, + pattern: /(^|\s)-{1,2}(?:\w+:[+-]?)?\w+(?:[.-]\w+)*(?=[=\s]|$)/, alias: 'variable', lookbehind: true }, diff --git a/tests/languages/bash/parameter_feature.test b/tests/languages/bash/parameter_feature.test index 000a040703..f0ca0ee685 100644 --- a/tests/languages/bash/parameter_feature.test +++ b/tests/languages/bash/parameter_feature.test @@ -1,5 +1,6 @@ docker run --name elk \ +--log-level info \ -p 5601:5601 \ --restart=always \ --privileged \ @@ -16,6 +17,10 @@ easyj/elk:7.12.1 " elk ", ["punctuation", "\\"], + ["parameter", "--log-level"], + " info ", + ["punctuation", "\\"], + ["parameter", "-p"], ["number", "5601"], ":5601 ",