From 786265439420ca117f198811ad9f3055b1a55c88 Mon Sep 17 00:00:00 2001 From: Marco Ferrari Date: Thu, 5 Nov 2020 23:21:41 +0100 Subject: [PATCH] Fix editorconfig-checker errors --- .devcontainer/devcontainer.json | 20 +++++++++---------- .gitattributes | 2 +- .github/ISSUE_TEMPLATE/ENHANCEMENT-REQUEST.md | 16 +++++++-------- .github/linters/.cfnlintrc.yml | 2 +- .github/linters/.chktexrc | 10 +++++----- .github/linters/.clj-kondo/config.edn | 9 +++++++-- .github/linters/.htmlhintrc | 2 +- .github/linters/.perlcriticrc | 2 +- .github/linters/.python-lint | 19 +++++++++--------- .github/release-drafter.yml | 6 +++--- .vscode/launch.json | 2 +- CODE_OF_CONDUCT.md | 6 +++--- TEMPLATES/.chktexrc | 10 +++++----- TEMPLATES/.clj-kondo/config.edn | 9 +++++++-- TEMPLATES/.htmlhintrc | 2 +- TEMPLATES/.perlcriticrc | 2 +- TEMPLATES/.python-lint | 19 +++++++++--------- TEMPLATES/phpstan.neon | 2 +- action.yml | 2 +- dependencies/Gemfile.lock | 2 +- docs/using-rules-files.md | 2 +- lib/possum.sh | 2 ++ 22 files changed, 79 insertions(+), 69 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ac0ac8e1..f6e6a287 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,12 +1,12 @@ { - "name": "SUPER-LINTER", - "context": "..", - "dockerFile": "..//Dockerfile", - "settings": { - "terminal.integrated.shell.linux": "/bin/bash" - }, - "extensions": [ - "github.vscode-pull-request-github", - "rogalmic.bash-debug" - ] + "name": "SUPER-LINTER", + "context": "..", + "dockerFile": "..//Dockerfile", + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + }, + "extensions": [ + "github.vscode-pull-request-github", + "rogalmic.bash-debug" + ] } diff --git a/.gitattributes b/.gitattributes index 5dc46e6b..314766e9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ * text=auto eol=lf *.{cmd,[cC][mM][dD]} text eol=crlf -*.{bat,[bB][aA][tT]} text eol=crlf \ No newline at end of file +*.{bat,[bB][aA][tT]} text eol=crlf diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT-REQUEST.md b/.github/ISSUE_TEMPLATE/ENHANCEMENT-REQUEST.md index 039816f9..74cec1fe 100644 --- a/.github/ISSUE_TEMPLATE/ENHANCEMENT-REQUEST.md +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT-REQUEST.md @@ -14,18 +14,18 @@ about: Used for requesting enhancements to the GitHub Super-Linter **Your impression of priority / how important this request is** - - [ ] Critical: Can't use the tool without it. - - [ ] Business Critical: Immediate opportunity to win business with this feature - - [ ] Important: Will significantly enhance the overall utility of the demo - - [ ] Nice to have: self-explanatory +- [ ] Critical: Can't use the tool without it. +- [ ] Business Critical: Immediate opportunity to win business with this feature +- [ ] Important: Will significantly enhance the overall utility of the demo +- [ ] Nice to have: self-explanatory **Business case or other information justifying priority** **Agreed upon priority** - - [ ] Critical: Can't use the tool without it. - - [ ] Business Critical: Immediate opportunity to win business with this feature - - [ ] Important: Will significantly enhance the overall utility of the demo - - [ ] Nice to have: self-explanatory +- [ ] Critical: Can't use the tool without it. +- [ ] Business Critical: Immediate opportunity to win business with this feature +- [ ] Important: Will significantly enhance the overall utility of the demo +- [ ] Nice to have: self-explanatory **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc) diff --git a/.github/linters/.cfnlintrc.yml b/.github/linters/.cfnlintrc.yml index 545080a4..16e8c976 100644 --- a/.github/linters/.cfnlintrc.yml +++ b/.github/linters/.cfnlintrc.yml @@ -1,2 +1,2 @@ include_checks: -- I + - I diff --git a/.github/linters/.chktexrc b/.github/linters/.chktexrc index 98750c47..c2a96fb1 100644 --- a/.github/linters/.chktexrc +++ b/.github/linters/.chktexrc @@ -175,7 +175,7 @@ TabSize = 8 CmdLine { - -v2 + -v2 } ##################################################################### @@ -756,9 +756,9 @@ MathRoman Primitives { - \above \advance \catcode \chardef \closein \closeout \copy \count - \countdef \cr \crcr \csname \delcode \dimendef \dimen \divide - \expandafter \font \hskip \vskip \openout + \above \advance \catcode \chardef \closein \closeout \copy \count + \countdef \cr \crcr \csname \delcode \dimendef \dimen \divide + \expandafter \font \hskip \vskip \openout } ##################################################################### @@ -771,7 +771,7 @@ Primitives NoCharNext { - \left:{}$ \right:{}$ + \left:{}$ \right:{}$ } ##################################################################### diff --git a/.github/linters/.clj-kondo/config.edn b/.github/linters/.clj-kondo/config.edn index 30cae4c6..8a2999a1 100644 --- a/.github/linters/.clj-kondo/config.edn +++ b/.github/linters/.clj-kondo/config.edn @@ -1,2 +1,7 @@ -{:linters {:unresolved-symbol {:exclude [(compojure.api.sweet/defroutes)]} - :refer-all {:exclude [clj-time.jdbc]}}} +{:linters + {:unresolved-symbol + {:exclude [(compojure.api.sweet/defroutes)]} + :refer-all + {:exclude [clj-time.jdbc]} + } +} diff --git a/.github/linters/.htmlhintrc b/.github/linters/.htmlhintrc index 7fc24f8d..5daf1dd9 100644 --- a/.github/linters/.htmlhintrc +++ b/.github/linters/.htmlhintrc @@ -22,4 +22,4 @@ "href-abs-or-rel": false, "attr-unsafe-chars": true, "head-script-disabled": true -} \ No newline at end of file +} diff --git a/.github/linters/.perlcriticrc b/.github/linters/.perlcriticrc index ad6196a3..eb920334 100644 --- a/.github/linters/.perlcriticrc +++ b/.github/linters/.perlcriticrc @@ -1,2 +1,2 @@ severity = 1 -verbose = %f:%l:%c [%s %p] %m near '%r'\n \ No newline at end of file +verbose = %f:%l:%c [%s %p] %m near '%r'\n diff --git a/.github/linters/.python-lint b/.github/linters/.python-lint index e3d9f5b5..ae374f57 100644 --- a/.github/linters/.python-lint +++ b/.github/linters/.python-lint @@ -323,11 +323,11 @@ function-naming-style=snake_case # Good variable names which should always be accepted, separated by a comma good-names=i, - j, - k, - ex, - Run, - _ + j, + k, + ex, + Run, + _ # Include a hint for the correct naming format with invalid-name include-naming-hint=no @@ -418,8 +418,7 @@ max-module-lines=1000 # separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. # `trailing-comma` allows a space between comma and closing bracket: (a, ). # `empty-line` allows space-only lines. -no-space-check=trailing-comma, - dict-separator +no-space-check=trailing-comma,dict-separator # Allow the body of a class to be on the same line as the declaration if body # contains single statement. @@ -490,9 +489,9 @@ analyse-fallback-blocks=no # Deprecated modules which should not be used, separated by a comma deprecated-modules=regsub, - TERMIOS, - Bastion, - rexec + TERMIOS, + Bastion, + rexec # Create a graph of external dependencies in the given file (report RP0402 must # not be disabled) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 5cf492db..b012a4f3 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -3,9 +3,9 @@ tag-template: 'v$RESOLVED_VERSION' template: | # Changelog $CHANGES - - See details of [all code changes](https://github.com/github/super-linter/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION) since previous release - + + See details of [all code changes](https://github.com/github/super-linter/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION) since previous release + categories: - title: '🚀 Features' labels: diff --git a/.vscode/launch.json b/.vscode/launch.json index 77e1ced2..4e554e66 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -13,4 +13,4 @@ } } ] -} \ No newline at end of file +} diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index bda24167..6c96647a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -23,13 +23,13 @@ include: Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or - advances + advances * Trolling, insulting/derogatory comments, and personal or political attacks * Public or private harassment * Publishing others' private information, such as a physical or electronic - address, without explicit permission + address, without explicit permission * Other conduct which could reasonably be considered inappropriate in a - professional setting + professional setting ## Our Responsibilities diff --git a/TEMPLATES/.chktexrc b/TEMPLATES/.chktexrc index 98750c47..c2a96fb1 100644 --- a/TEMPLATES/.chktexrc +++ b/TEMPLATES/.chktexrc @@ -175,7 +175,7 @@ TabSize = 8 CmdLine { - -v2 + -v2 } ##################################################################### @@ -756,9 +756,9 @@ MathRoman Primitives { - \above \advance \catcode \chardef \closein \closeout \copy \count - \countdef \cr \crcr \csname \delcode \dimendef \dimen \divide - \expandafter \font \hskip \vskip \openout + \above \advance \catcode \chardef \closein \closeout \copy \count + \countdef \cr \crcr \csname \delcode \dimendef \dimen \divide + \expandafter \font \hskip \vskip \openout } ##################################################################### @@ -771,7 +771,7 @@ Primitives NoCharNext { - \left:{}$ \right:{}$ + \left:{}$ \right:{}$ } ##################################################################### diff --git a/TEMPLATES/.clj-kondo/config.edn b/TEMPLATES/.clj-kondo/config.edn index 30cae4c6..8a2999a1 100644 --- a/TEMPLATES/.clj-kondo/config.edn +++ b/TEMPLATES/.clj-kondo/config.edn @@ -1,2 +1,7 @@ -{:linters {:unresolved-symbol {:exclude [(compojure.api.sweet/defroutes)]} - :refer-all {:exclude [clj-time.jdbc]}}} +{:linters + {:unresolved-symbol + {:exclude [(compojure.api.sweet/defroutes)]} + :refer-all + {:exclude [clj-time.jdbc]} + } +} diff --git a/TEMPLATES/.htmlhintrc b/TEMPLATES/.htmlhintrc index 7fc24f8d..5daf1dd9 100644 --- a/TEMPLATES/.htmlhintrc +++ b/TEMPLATES/.htmlhintrc @@ -22,4 +22,4 @@ "href-abs-or-rel": false, "attr-unsafe-chars": true, "head-script-disabled": true -} \ No newline at end of file +} diff --git a/TEMPLATES/.perlcriticrc b/TEMPLATES/.perlcriticrc index ad6196a3..eb920334 100644 --- a/TEMPLATES/.perlcriticrc +++ b/TEMPLATES/.perlcriticrc @@ -1,2 +1,2 @@ severity = 1 -verbose = %f:%l:%c [%s %p] %m near '%r'\n \ No newline at end of file +verbose = %f:%l:%c [%s %p] %m near '%r'\n diff --git a/TEMPLATES/.python-lint b/TEMPLATES/.python-lint index 19cc7082..ecb84b71 100644 --- a/TEMPLATES/.python-lint +++ b/TEMPLATES/.python-lint @@ -324,11 +324,11 @@ function-naming-style=snake_case # Good variable names which should always be accepted, separated by a comma good-names=i, - j, - k, - ex, - Run, - _ + j, + k, + ex, + Run, + _ # Include a hint for the correct naming format with invalid-name include-naming-hint=no @@ -419,8 +419,7 @@ max-module-lines=1000 # separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. # `trailing-comma` allows a space between comma and closing bracket: (a, ). # `empty-line` allows space-only lines. -no-space-check=trailing-comma, - dict-separator +no-space-check=trailing-comma,dict-separator # Allow the body of a class to be on the same line as the declaration if body # contains single statement. @@ -491,9 +490,9 @@ analyse-fallback-blocks=no # Deprecated modules which should not be used, separated by a comma deprecated-modules=regsub, - TERMIOS, - Bastion, - rexec + TERMIOS, + Bastion, + rexec # Create a graph of external dependencies in the given file (report RP0402 must # not be disabled) diff --git a/TEMPLATES/phpstan.neon b/TEMPLATES/phpstan.neon index 069eb1c9..a2b3ad88 100644 --- a/TEMPLATES/phpstan.neon +++ b/TEMPLATES/phpstan.neon @@ -1,2 +1,2 @@ parameters: - level: 5 + level: 5 diff --git a/action.yml b/action.yml index e74b75cc..14644e81 100644 --- a/action.yml +++ b/action.yml @@ -5,5 +5,5 @@ runs: using: 'docker' image: 'docker://ghcr.io/github/super-linter:v3' branding: - icon: 'check-square' + icon: 'check-square' color: 'white' diff --git a/dependencies/Gemfile.lock b/dependencies/Gemfile.lock index 076e8a5e..0638d874 100644 --- a/dependencies/Gemfile.lock +++ b/dependencies/Gemfile.lock @@ -57,4 +57,4 @@ DEPENDENCIES rubocop-rspec (~> 1.41.0) BUNDLED WITH - 2.1.4 + 2.1.4 diff --git a/docs/using-rules-files.md b/docs/using-rules-files.md index 9c1fe052..2eafbe19 100644 --- a/docs/using-rules-files.md +++ b/docs/using-rules-files.md @@ -6,7 +6,7 @@ You can tell Super-Linter where your rules files are located with the ``LINTER_R ## Here is an example -Below is an example of how to configure the ``env`` section of Super-Linter's ``linter.yml`` to lint JavaScript and CSS code using ``eslint`` and ``stylelint`` with your own ``.eslintrc.json`` and ``.stylelintrc.json`` rules files that are located in the root directory of your repository. +Below is an example of how to configure the ``env`` section of Super-Linter's ``linter.yml`` to lint JavaScript and CSS code using ``eslint`` and ``stylelint`` with your own ``.eslintrc.json`` and ``.stylelintrc.json`` rules files that are located in the root directory of your repository. ``` yaml env: diff --git a/lib/possum.sh b/lib/possum.sh index 92944cdd..e8a63c34 100755 --- a/lib/possum.sh +++ b/lib/possum.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# editorconfig-checker-disable cat << EOF -------------------------------------------------------------------------------- @@ -20,3 +21,4 @@ cat << EOF -------------------------------------------------------------------------------- EOF +# editorconfig-checker-enable