feat(linters,formatters): fmt files

creativenull · Aug 1, 2023 · 1133482 · 1133482
1 parent 755f77c
commit 1133482
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 35 deletions.
diff --git a/lua/efmls-configs/formatters/forge_fmt.lua b/lua/efmls-configs/formatters/forge_fmt.lua
@@ -6,5 +6,5 @@ local command = string.format('%s fmt --raw -', fs.executable(formatter))
 return {
   formatCommand = command,
   formatStdin = true,
-  rootMarkers = { "foundry.toml" },
+  rootMarkers = { 'foundry.toml' },
 }
diff --git a/lua/efmls-configs/formatters/prettier.lua b/lua/efmls-configs/formatters/prettier.lua
@@ -12,14 +12,14 @@ return {
   formatCommand = command,
   formatStdin = true,
   rootMarkers = {
-    ".prettierrc",
-    ".prettierrc.json",
-    ".prettierrc.js",
-    ".prettierrc.yml",
-    ".prettierrc.yaml",
-    ".prettierrc.json5",
-    ".prettierrc.mjs",
-    ".prettierrc.cjs",
-    ".prettierrc.toml",
+    '.prettierrc',
+    '.prettierrc.json',
+    '.prettierrc.js',
+    '.prettierrc.yml',
+    '.prettierrc.yaml',
+    '.prettierrc.json5',
+    '.prettierrc.mjs',
+    '.prettierrc.cjs',
+    '.prettierrc.toml',
   },
 }
diff --git a/lua/efmls-configs/formatters/prettier_d.lua b/lua/efmls-configs/formatters/prettier_d.lua
@@ -11,5 +11,5 @@ return {
   formatCanRange = true,
   formatCommand = command,
   formatStdin = true,
-  rootMarkers = require("efmls-configs.formatters.prettier").rootMarkers,
+  rootMarkers = require('efmls-configs.formatters.prettier').rootMarkers,
 }
diff --git a/lua/efmls-configs/formatters/stylua.lua b/lua/efmls-configs/formatters/stylua.lua
@@ -2,8 +2,7 @@ local fs = require('efmls-configs.fs')
 
 local formatter = 'stylua'
 local command = string.format(
-  '%s ${--indent-width:tabSize} ${--range-start:charStart} '
-    .. '${--range-end:charEnd} --color Never -',
+  '%s ${--indent-width:tabSize} ${--range-start:charStart} ' .. '${--range-end:charEnd} --color Never -',
   fs.executable(formatter)
 )
 

diff --git a/lua/efmls-configs/linters/djlint.lua b/lua/efmls-configs/linters/djlint.lua
@@ -6,10 +6,10 @@ local args = [[--linter-output-format 'I:{line}: {message}' --profile=django -]]
 local command = string.format('%s %s', bin, args)
 
 return {
-    prefix = linter,
-    lintCommand = command,
-    lintFormats = {'%t:%l:%c: %m'},
-    lintStdin = true,
-    lintIgnoreExitCode = true,
-    lintDebounce = "1s",
+  prefix = linter,
+  lintCommand = command,
+  lintFormats = { '%t:%l:%c: %m' },
+  lintStdin = true,
+  lintIgnoreExitCode = true,
+  lintDebounce = '1s',
 }
diff --git a/lua/efmls-configs/linters/slither.lua b/lua/efmls-configs/linters/slither.lua
@@ -19,7 +19,8 @@ local args = '--json - "${INPUT}"'
 -- 3. Pick out the marked results. It'll be the even-numbered fields,
 --    example: junk|results|junk|results|junk.
 -- 4. Turn the "lines" result (e.g. "1,2,3,4") into range (e.g. "1-4").
-local command = string.format([=[
+local command = string.format(
+  [=[
 %s %s --solc-remaps "$([ -f remappings.txt ] && tr '\n' ' ' < remappings.txt | xargs)" \
 | sed "s/filename_absolute/$(printf '%%b' '\0036')filename_absolute/g" \
 | sed "s/lines/$(printf '%%b' '\0036')lines/g" \
@@ -28,7 +29,10 @@ local command = string.format([=[
 | sed "s/\"elements\"[^$(printf '%%b' '\0036')]*\"$(printf '%%b' '\0036')filename_absolute\": \"\([^\"]*\)\"[^$(printf '%%b' '\0036')]*\"$(printf '%%b' '\0036')lines\": \[\([^]]*\)\][^0-9]*starting_column\": \([0-9]*\), \"ending_column\": \([0-9]*\)[^$(printf '%%b' '\0037')]*$(printf '%%b' '\0037')description\": \"\([^\"]*\)[^$(printf '%%b' '\0036')]*\"$(printf '%%b' '\0036')impact\": \"\([^\"]*\)\"/$(printf '%%b' '\0035')\2| \3-\4 of \1 (\6): \5$(printf '%%b' '\0035')/g" \
 | awk -F "$(printf '%%b' '\0035')" '{for (i=2; i<=NF; i+=2) print $i}' \
 | awk -F "|" '{split($1, a, ", "); $1=a[1] "-" a[length(a)] ":"; print $0}'
-]=], bin, args)
+]=],
+  bin,
+  args
+)
 
 return {
   lintCategoryMap = {
@@ -45,19 +49,19 @@ return {
   -- https://github.com/crytic/slither/issues/2057
   lintStdin = false,
   lintFormats = {
-    "%l-%e:  %c-%k of %f (%tow): %m",
-    "%l-%e:  %c-%k of %f (%tedium): %m",
-    "%l-%e:  %c-%k of %f (%tigh): %m",
-    "%l-%e:  %c-%k of %f (%tptimization): %m",
-    "%l-%e:  %c-%k of %f (%tnformational): %m",
+    '%l-%e:  %c-%k of %f (%tow): %m',
+    '%l-%e:  %c-%k of %f (%tedium): %m',
+    '%l-%e:  %c-%k of %f (%tigh): %m',
+    '%l-%e:  %c-%k of %f (%tptimization): %m',
+    '%l-%e:  %c-%k of %f (%tnformational): %m',
   },
   rootMarkers = {
-    "hardhat.config.js",
-    "hardhat.config.ts",
-    "foundry.toml",
-    "remappings.txt",
-    "truffle.js",
-    "truffle-config.js",
-    "ape-config.yaml",
+    'hardhat.config.js',
+    'hardhat.config.ts',
+    'foundry.toml',
+    'remappings.txt',
+    'truffle.js',
+    'truffle-config.js',
+    'ape-config.yaml',
   },
 }
diff --git a/lua/efmls-configs/linters/stylelint.lua b/lua/efmls-configs/linters/stylelint.lua
@@ -9,5 +9,5 @@ return {
   lintCommand = command,
   lintStdin = true,
   lintFormats = { '%.%#: line %l, col %c, %trror - %m', '%.%#: line %l, col %c, %tarning - %m' },
-  rootMarkers = { '.stylelintrc' }
+  rootMarkers = { '.stylelintrc' },
 }
diff --git a/lua/efmls-configs/linters/yamllint.lua b/lua/efmls-configs/linters/yamllint.lua
@@ -9,4 +9,3 @@ return {
   lintCommand = command,
   lintStdin = true,
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,3 @@ return {
		lintCommand = command,
		lintStdin = true,
		}