|
|
@@ -16,7 +16,7 @@ setopt FUNCTION_ARGZERO
|
|
|
# setopt WARN_NESTED_VAR
|
|
|
# setopt XTRACE
|
|
|
|
|
|
-autoload -Uz is-at-least && if ! is-at-least 5.2; then
|
|
|
+autoload -Uz is-at-least && if ! is-at-least 5.8; then
|
|
|
print -u2 -PR "%F{1}${funcstack[1]##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade zsh to fix this issue."
|
|
|
exit 1
|
|
|
fi
|
|
|
@@ -27,52 +27,113 @@ invoke_formatter() {
|
|
|
exit 2
|
|
|
}
|
|
|
|
|
|
- case ${1} {
|
|
|
+ local formatter="${1}"
|
|
|
+ shift
|
|
|
+ local -a source_files=(${@})
|
|
|
+
|
|
|
+ case ${formatter} {
|
|
|
clang)
|
|
|
if (( ${+commands[clang-format-17]} )) {
|
|
|
local formatter=clang-format-17
|
|
|
} elif (( ${+commands[clang-format]} )) {
|
|
|
local formatter=clang-format
|
|
|
- local -a formatter_version=($(clang-format --version))
|
|
|
-
|
|
|
- if ! is-at-least 17.0.3 ${formatter_version[-1]}; then
|
|
|
- log_error "clang-format is not version 17.0.3 or above (found ${formatter_version[-1]}."
|
|
|
- exit 2
|
|
|
- fi
|
|
|
-
|
|
|
- if ! is-at-least ${formatter_version[-1]} 17.0.3; then
|
|
|
- log_error "clang-format is more recent than version 17.0.3 (found ${formatter_version[-1]})."
|
|
|
- exit 2
|
|
|
- fi
|
|
|
} else {
|
|
|
log_error "No viable clang-format version found (required 17.0.3)"
|
|
|
exit 2
|
|
|
}
|
|
|
|
|
|
- local -a source_files=(src/**/*.(c|cpp|h|hpp|m|mm)(.N))
|
|
|
+ local -a formatter_version=($(${formatter} --version))
|
|
|
+
|
|
|
+ if ! is-at-least 17.0.3 ${formatter_version[-1]}; then
|
|
|
+ log_error "clang-format is not version 17.0.3 or above (found ${formatter_version[-1]}."
|
|
|
+ exit 2
|
|
|
+ fi
|
|
|
+
|
|
|
+ if ! is-at-least ${formatter_version[-1]} 17.0.3; then
|
|
|
+ log_error "clang-format is more recent than version 17.0.3 (found ${formatter_version[-1]})."
|
|
|
+ exit 2
|
|
|
+ fi
|
|
|
+
|
|
|
+ if (( ! #source_files )) source_files=(src/**/*.(c|cpp|h|hpp|m|mm)(.N))
|
|
|
|
|
|
local -a format_args=(-style=file -fallback-style=none)
|
|
|
if (( _loglevel > 2 )) format_args+=(--verbose)
|
|
|
+
|
|
|
+ check_files() {
|
|
|
+ local -i num_failures=0
|
|
|
+ local -a source_files=($@)
|
|
|
+ local file
|
|
|
+ local -a format_args=(-style=file -fallback-style=none)
|
|
|
+ if (( _loglevel > 2 )) format_args+=(--verbose)
|
|
|
+
|
|
|
+ local -a command=(${formatter} ${format_args})
|
|
|
+
|
|
|
+ for file (${source_files}) {
|
|
|
+ if ! ${command} "${file}" | diff -q "${file}" - &> /dev/null; then
|
|
|
+ log_error "${file} requires formatting changes."
|
|
|
+ if (( fail_on_error == 2 )) return 2;
|
|
|
+ num_failures=$(( num_failures + 1 ))
|
|
|
+ fi
|
|
|
+ }
|
|
|
+ if (( num_failures && fail_on_error == 1 )) return 2
|
|
|
+ }
|
|
|
+
|
|
|
+ format_files() {
|
|
|
+ local -a source_files=($@)
|
|
|
+
|
|
|
+ if (( ${#source_files} )) {
|
|
|
+ local -a format_args=(-style=file -fallback-style=none -i)
|
|
|
+ if (( _loglevel > 2 )) format_args+=(--verbose)
|
|
|
+
|
|
|
+ "${formatter}" ${format_args} ${source_files}
|
|
|
+ }
|
|
|
+ }
|
|
|
;;
|
|
|
- cmake)
|
|
|
- local formatter=cmake-format
|
|
|
- if (( ${+commands[cmake-format]} )) {
|
|
|
- local cmake_format_version=$(cmake-format --version)
|
|
|
+ gersemi)
|
|
|
+ local formatter=gersemi
|
|
|
+ if (( ${+commands[gersemi]} )) {
|
|
|
+ local gersemi_version=($(gersemi --version))
|
|
|
|
|
|
- if ! is-at-least 0.6.13 ${cmake_format_version}; then
|
|
|
- log_error "cmake-format is not version 0.6.13 or above (found ${cmake_format_version})."
|
|
|
+ if ! is-at-least 0.12.0 ${gersemi_version[2]}; then
|
|
|
+ log_error "gersemi is not version 0.12.0 or above (found ${gersemi_version[2]}."
|
|
|
exit 2
|
|
|
fi
|
|
|
- } else {
|
|
|
- log_error "No viable cmake-format version found (required 0.6.13)"
|
|
|
- exit 2
|
|
|
}
|
|
|
|
|
|
- local -a source_files=(**/(CMakeLists.txt|*.cmake)(.N))
|
|
|
- source_files=(${source_files:#(build_*)/*})
|
|
|
+ if (( ! #source_files )) source_files=(CMakeLists.txt (cmake)/**/(CMakeLists.txt|*.cmake)(.N))
|
|
|
+
|
|
|
+ check_files() {
|
|
|
+ local -i num_failures=0
|
|
|
+ local -a source_files=($@)
|
|
|
+ local file
|
|
|
+ local -a command=(${formatter} -c --no-cache ${source_files})
|
|
|
+
|
|
|
+ if (( ${#source_files} )) {
|
|
|
+ while read -r line; do
|
|
|
+ local -a line_tokens=(${(z)line})
|
|
|
+ if (( #line_tokens )) {
|
|
|
+ file=${line_tokens[1]//*${project_root}\//}
|
|
|
|
|
|
- local -a format_args=()
|
|
|
- if (( _loglevel > 2 )) format_args+=(--log-level debug)
|
|
|
+ log_error "${file} requires formatting changes."
|
|
|
+ } else {
|
|
|
+ log_error "${line}"
|
|
|
+ }
|
|
|
+
|
|
|
+ if (( fail_on_error == 2 )) return 2
|
|
|
+ num_failures=$(( num_failures + 1 ))
|
|
|
+ done < <(${command} 2>&1)
|
|
|
+
|
|
|
+ if (( num_failures && fail_on_error == 1 )) return 2
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ format_files() {
|
|
|
+ local -a source_files=($@)
|
|
|
+
|
|
|
+ if (( ${#source_files} )) {
|
|
|
+ "${formatter}" -i ${source_files}
|
|
|
+ }
|
|
|
+ }
|
|
|
;;
|
|
|
swift)
|
|
|
local formatter=swift-format
|
|
|
@@ -88,50 +149,75 @@ invoke_formatter() {
|
|
|
exit 2
|
|
|
}
|
|
|
|
|
|
- local -a source_files=(**/*.swift(.N))
|
|
|
+ if (( ! #source_files )) source_files=(src/**/*.swift(.N))
|
|
|
+
|
|
|
+ check_files() {
|
|
|
+ local -i num_failures=0
|
|
|
+ local -a source_files=($@)
|
|
|
+ local file
|
|
|
+ local -a format_args=()
|
|
|
|
|
|
- local -a format_args=()
|
|
|
+ local -a command=(${formatter} ${format_args})
|
|
|
+
|
|
|
+ for file (${source_files}) {
|
|
|
+ if ! "${command}" "${file}" | diff -q "${file}" - &> /dev/null; then
|
|
|
+ log_error "${file} requires formatting changes."
|
|
|
+ if (( fail_on_error == 2 )) return 2;
|
|
|
+ num_failures=$(( num_failures + 1 ))
|
|
|
+ fi
|
|
|
+ }
|
|
|
+ if (( num_failures && fail_on_error == 1 )) return 2
|
|
|
+ }
|
|
|
+
|
|
|
+ format_files() {
|
|
|
+ local -a source_files=($@)
|
|
|
+
|
|
|
+ if (( ${#source_files} )) {
|
|
|
+ local -a format_args=(-i)
|
|
|
+
|
|
|
+ "${formatter}" ${format_args} ${source_files}
|
|
|
+ }
|
|
|
+ }
|
|
|
;;
|
|
|
- *) log_error "Invalid formatter specified: ${1}. Valid options are clang-format, cmake-format, and swift-format."; exit 2 ;;
|
|
|
+ *) log_error "Invalid formatter specified: ${1}. Valid options are clang-format, gersemi, and swift-format."; exit 2 ;;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
local file
|
|
|
local -i num_failures=0
|
|
|
if (( check_only )) {
|
|
|
- for file (${source_files}) {
|
|
|
- if (( _loglevel > 1 )) log_info "Checking format of ${file}..."
|
|
|
-
|
|
|
- if ! "${formatter}" ${format_args} "${file}" | diff -q "${file}" - &> /dev/null; then
|
|
|
- log_error "${file} requires formatting changes."
|
|
|
-
|
|
|
- if (( fail_on_error == 2 )) return 2;
|
|
|
- num_failures=$(( num_failures + 1 ))
|
|
|
- else
|
|
|
- if (( _loglevel > 1 )) log_status "${file} requires no formatting changes."
|
|
|
- fi
|
|
|
+ if (( ${+functions[check_files]} )) {
|
|
|
+ check_files ${source_files}
|
|
|
+ } else {
|
|
|
+ log_error "No format check function defined for formatter '${formatter}'"
|
|
|
+ exit 2
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (( ${+functions[format_files]} )) {
|
|
|
+ format_files ${source_files}
|
|
|
+ } else {
|
|
|
+ log_error "No format function defined for formatter '${formatter}'"
|
|
|
+ exit 2
|
|
|
}
|
|
|
- if (( fail_on_error && num_failures )) return 2;
|
|
|
- } elif (( ${#source_files} )) {
|
|
|
- format_args+=(-i)
|
|
|
- "${formatter}" ${format_args} ${source_files}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
run_format() {
|
|
|
if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h}
|
|
|
if (( ! ${+FORMATTER_NAME} )) typeset -g FORMATTER_NAME=${${(s:-:)ZSH_ARGZERO:t:r}[2]}
|
|
|
+ local project_root=${SCRIPT_HOME:A:h}
|
|
|
|
|
|
typeset -g host_os=${${(L)$(uname -s)}//darwin/macos}
|
|
|
local -i fail_on_error=0
|
|
|
local -i check_only=0
|
|
|
local -i verbosity=1
|
|
|
- local -r _version='1.0.0'
|
|
|
+ local -r _version='2.0.0'
|
|
|
|
|
|
fpath=("${SCRIPT_HOME}/.functions" ${fpath})
|
|
|
autoload -Uz log_info log_error log_output set_loglevel log_status log_warning
|
|
|
|
|
|
local -r _usage="
|
|
|
-Usage: %B${functrace[1]%:*}%b <option>
|
|
|
+Usage: %B${functrace[1]%:*}%b <option> [SOURCE_FILES]
|
|
|
|
|
|
%BOptions%b:
|
|
|
|
|
|
@@ -153,13 +239,8 @@ Usage: %B${functrace[1]%:*}%b <option>
|
|
|
local -a args
|
|
|
while (( # )) {
|
|
|
case ${1} {
|
|
|
- --)
|
|
|
- shift
|
|
|
- args+=($@)
|
|
|
- break
|
|
|
- ;;
|
|
|
-c|--check) check_only=1; shift ;;
|
|
|
- -v|--verbose) (( _verbosity += 1 )); shift ;;
|
|
|
+ -v|--verbose) (( verbosity += 1 )); shift ;;
|
|
|
-h|--help) log_output ${_usage}; exit 0 ;;
|
|
|
-V|--version) print -Pr "${_version}"; exit 0 ;;
|
|
|
--debug) verbosity=3; shift ;;
|
|
|
@@ -175,14 +256,17 @@ Usage: %B${functrace[1]%:*}%b <option>
|
|
|
fail_on_error=2
|
|
|
shift
|
|
|
;;
|
|
|
- *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
|
|
|
+ *)
|
|
|
+ args+=($@)
|
|
|
+ break
|
|
|
+ ;;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
set -- ${(@)args}
|
|
|
set_loglevel ${verbosity}
|
|
|
|
|
|
- invoke_formatter ${FORMATTER_NAME}
|
|
|
+ invoke_formatter ${FORMATTER_NAME} ${args}
|
|
|
}
|
|
|
|
|
|
run_format ${@}
|
PatTheMav