From 8a7497c4f02304811b8ce5ec15d3263fc78ba83e Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sun, 5 Apr 2020 17:07:05 -0400 Subject: [PATCH] Simplify checkVariableBraces --- src/ShellCheck/Analytics.hs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/ShellCheck/Analytics.hs b/src/ShellCheck/Analytics.hs index f5a8047..dd4e4c7 100644 --- a/src/ShellCheck/Analytics.hs +++ b/src/ShellCheck/Analytics.hs @@ -1955,19 +1955,16 @@ prop_CheckVariableBraces1 = verify checkVariableBraces "a='123'; echo $a" prop_CheckVariableBraces2 = verifyNot checkVariableBraces "a='123'; echo ${a}" prop_CheckVariableBraces3 = verifyNot checkVariableBraces "#shellcheck disable=SC2016\necho '$a'" prop_CheckVariableBraces4 = verifyNot checkVariableBraces "echo $* $1" -checkVariableBraces params t = - case t of - T_DollarBraced id False _ - | name `notElem` unbracedVariables -> - styleWithFix id 2250 - "Prefer putting braces around variable references even when not strictly required." - (fixFor t) - - _ -> return () +checkVariableBraces params t@(T_DollarBraced id False _) + | name `notElem` unbracedVariables = + styleWithFix id 2250 + "Prefer putting braces around variable references even when not strictly required." + (fixFor t) where name = getBracedReference $ bracedString t fixFor token = fixWith [replaceStart (getId token) params 1 "${" ,replaceEnd (getId token) params 0 "}"] +checkVariableBraces _ _ = return () prop_checkQuotesInLiterals1 = verifyTree checkQuotesInLiterals "param='--foo=\"bar\"'; app $param" prop_checkQuotesInLiterals1a= verifyTree checkQuotesInLiterals "param=\"--foo='lolbar'\"; app $param"