From f51dc68e1bb170fc49c2d7e13eb45e5ec83f5ee9 Mon Sep 17 00:00:00 2001 From: Jongwook Choi Date: Wed, 20 Apr 2022 00:21:37 -0400 Subject: [PATCH] fix: Fix stylua errors and install_stylua script (#923) - Fix code style issues, suggested by stylua - Update install_stylua.lua script so that it can run in macOS as well. --- lua/cmp/config/mapping.lua | 12 ++++++------ lua/cmp/utils/misc.lua | 1 - utils/install_stylua.sh | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lua/cmp/config/mapping.lua b/lua/cmp/config/mapping.lua index ad8c2dd..c2028c8 100644 --- a/lua/cmp/config/mapping.lua +++ b/lua/cmp/config/mapping.lua @@ -1,7 +1,7 @@ local types = require('cmp.types') local misc = require('cmp.utils.misc') local feedkeys = require('cmp.utils.feedkeys') -local keymap = require('cmp.utils.keymap') +local keymap = require('cmp.utils.keymap') local mapping = setmetatable({}, { __call = function(_, invoke, modes) @@ -39,7 +39,7 @@ mapping.preset.insert = function(override) }, [''] = { i = mapping.abort(), - } + }, }) end @@ -54,7 +54,7 @@ mapping.preset.cmdline = function(override) else feedkeys.call(keymap.t(''), 'n') end - end + end, }, [''] = { c = function() @@ -64,7 +64,7 @@ mapping.preset.cmdline = function(override) else feedkeys.call(keymap.t(''), 'n') end - end + end, }, [''] = { c = function(fallback) @@ -74,7 +74,7 @@ mapping.preset.cmdline = function(override) else fallback() end - end + end, }, [''] = { c = function(fallback) @@ -84,7 +84,7 @@ mapping.preset.cmdline = function(override) else fallback() end - end + end, }, [''] = { c = mapping.close(), diff --git a/lua/cmp/utils/misc.lua b/lua/cmp/utils/misc.lua index 73eef62..9535f28 100644 --- a/lua/cmp/utils/misc.lua +++ b/lua/cmp/utils/misc.lua @@ -251,4 +251,3 @@ misc.redraw = setmetatable({ }) return misc - diff --git a/utils/install_stylua.sh b/utils/install_stylua.sh index 963416e..7e23bbe 100755 --- a/utils/install_stylua.sh +++ b/utils/install_stylua.sh @@ -4,8 +4,7 @@ set -eu pipefall declare -r INSTALL_DIR="$PWD/utils" declare -r RELEASE="0.10.0" -declare -r OS="linux" -# declare -r OS="$(uname -s)" +declare -r OS=$([ "$(uname -s)" == "Darwin" ] && echo "macos" || echo "linux") declare -r FILENAME="stylua-$RELEASE-$OS" declare -a __deps=("curl" "unzip")