From a8fb9079a1e13280094bcf3f85910d602272459e Mon Sep 17 00:00:00 2001 From: eitsupi Date: Sat, 4 Jun 2022 16:49:18 +0900 Subject: [PATCH 1/2] update urls about lintr --- .automation/generated/linter-links-previews.json | 6 +++--- docs/all_linters.md | 2 +- docs/descriptors/r_lintr.md | 10 +++++----- megalinter/descriptors/r.megalinter-descriptor.yml | 8 ++++---- megalinter/linters/RLinter.py | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.automation/generated/linter-links-previews.json b/.automation/generated/linter-links-previews.json index 2b85e5f252d..00fc292c330 100644 --- a/.automation/generated/linter-links-previews.json +++ b/.automation/generated/linter-links-previews.json @@ -180,9 +180,9 @@ "title": "instrumenta/kubeval" }, "lintr": { - "description": "Static Code Analysis for R. Contribute to jimhester/lintr development by creating an account on GitHub.", + "description": "Static Code Analysis for R. Contribute to r-lib/lintr development by creating an account on GitHub.", "image": "https://avatars0.githubusercontent.com/u/205275?s=400&v=4", - "title": "jimhester/lintr" + "title": "r-lib/lintr" }, "luacheck": { "description": " A tool for linting and static analysis of Lua code. - luarocks/luacheck", @@ -444,4 +444,4 @@ "image": "https://avatars3.githubusercontent.com/u/5244945?s=400&v=4", "title": "adrienverge/yamllint" } -} \ No newline at end of file +} diff --git a/docs/all_linters.md b/docs/all_linters.md index 0d0e6f51015..73516b650ca 100644 --- a/docs/all_linters.md +++ b/docs/all_linters.md @@ -41,7 +41,7 @@ | [**ktlint**](https://github.com/pinterest/ktlint){target=_blank} | 0.45.2 | [MIT](licenses/ktlint.md) | [KOTLIN](descriptors/kotlin_ktlint.md) | :heart: | [MegaLinter reference](https://github.com/pinterest/ktlint#-with-continuous-integration){target=_blank} | | [**kubeconform**](https://github.com/yannh/kubeconform){target=_blank} | 0.4.12 | [Other](licenses/kubeconform.md) | [KUBERNETES](descriptors/kubernetes_kubeconform.md) | :white_circle: | [Repository](https://github.com/yannh/kubeconform){target=_blank} | | [**kubeval**](https://github.com/instrumenta/kubeval){target=_blank} | 0.16.1 | [Other](licenses/kubeval.md) | [KUBERNETES](descriptors/kubernetes_kubeval.md) | :white_circle: | [Repository](https://github.com/instrumenta/kubeval){target=_blank} | -| [**lintr**](https://github.com/jimhester/lintr){target=_blank} | N/A | | [R](descriptors/r_lintr.md) | :white_circle: | [Web Site](https://github.com/jimhester/lintr){target=_blank} | +| [**lintr**](https://github.com/r-lib/lintr){target=_blank} | N/A | | [R](descriptors/r_lintr.md) | :white_circle: | [Web Site](https://github.com/r-lib/lintr){target=_blank} | | [**luacheck**](https://github.com/luarocks/luacheck){target=_blank} | 0.26.1 | [MIT](licenses/luacheck.md) | [LUA](descriptors/lua_luacheck.md) | :no_entry_sign: | [Repository](https://github.com/luarocks/luacheck){target=_blank} | | [**markdown-link-check**](https://github.com/tcort/markdown-link-check){target=_blank} | 3.10.2 | | [MARKDOWN](descriptors/markdown_markdown_link_check.md) | :heart: | [MegaLinter reference](https://github.com/tcort/markdown-link-check#run-in-other-tools){target=_blank} | | [**markdown-table-formatter**](https://github.com/nvuillam/markdown-table-formatter){target=_blank} | 1.3.0 | [MIT](licenses/markdown-table-formatter.md) | [MARKDOWN](descriptors/markdown_markdown_table_formatter.md) | :white_circle: | [Repository](https://github.com/nvuillam/markdown-table-formatter){target=_blank} | diff --git a/docs/descriptors/r_lintr.md b/docs/descriptors/r_lintr.md index 05f324bb6f6..3d38da6b10c 100644 --- a/docs/descriptors/r_lintr.md +++ b/docs/descriptors/r_lintr.md @@ -4,12 +4,12 @@ ## lintr documentation -- Visit [Official Web Site](https://github.com/jimhester/lintr#readme){target=_blank} -- See [How to configure lintr rules](https://github.com/jimhester/lintr#project-configuration){target=_blank} +- Visit [Official Web Site](https://lintr.r-lib.org/){target=_blank} +- See [How to configure lintr rules](https://lintr.r-lib.org/articles/lintr.html#configuring-linters){target=_blank} - If custom `.lintr` config file is not found, [.lintr](https://github.com/megalinter/megalinter/tree/main/TEMPLATES/.lintr){target=_blank} will be used -- See [Index of problems detected by lintr](https://github.com/jimhester/lintr#available-linters){target=_blank} +- See [Index of problems detected by lintr](https://lintr.r-lib.org/reference/index.html){target=_blank} -[![lintr - GitHub](https://gh-card.dev/repos/jimhester/lintr.svg?fullname=)](https://github.com/jimhester/lintr){target=_blank} +[![lintr - GitHub](https://gh-card.dev/repos/r-lib/lintr.svg?fullname=)](https://github.com/r-lib/lintr){target=_blank} ## Configuration in MegaLinter @@ -42,7 +42,7 @@ Use lintr in your favorite IDE to catch errors before MegaLinter ! | | rstudio | [Native Support](https://rstudio.com/) | [Visit Web Site](https://rstudio.com/){target=_blank} | | | [Sublime Text](https://www.sublimetext.com/) | [SublimeLinter-contrib-lintr](https://github.com/jimhester/SublimeLinter-contrib-lintr) | [Visit Web Site](https://github.com/jimhester/SublimeLinter-contrib-lintr){target=_blank} | | | [vim](https://www.vim.org/) | [ale](https://github.com/dense-analysis/ale) | [Visit Web Site](https://github.com/dense-analysis/ale){target=_blank} | -| | [Visual Studio Code](https://code.visualstudio.com/) | [VsCode R LSP](https://marketplace.visualstudio.com/items?itemName=REditorSupport.r-lsp) | [![Install in VsCode](https://github.com/megalinter/megalinter/raw/main/docs/assets/images/btn_install_vscode.png)](vscode:extension/REditorSupport.r-lsp){target=_blank} | +| | [Visual Studio Code](https://code.visualstudio.com/) | [VsCode R](https://marketplace.visualstudio.com/items?itemName=REditorSupport.r) | [![Install in VsCode](https://github.com/megalinter/megalinter/raw/main/docs/assets/images/btn_install_vscode.png)](vscode:extension/REditorSupport.r){target=_blank} | ## MegaLinter Flavours diff --git a/megalinter/descriptors/r.megalinter-descriptor.yml b/megalinter/descriptors/r.megalinter-descriptor.yml index 8772eb055ae..5c1ac92ec8e 100644 --- a/megalinter/descriptors/r.megalinter-descriptor.yml +++ b/megalinter/descriptors/r.megalinter-descriptor.yml @@ -9,9 +9,9 @@ linters: # Lintr - class: RLinter linter_name: lintr - linter_url: https://github.com/jimhester/lintr - linter_rules_url: https://github.com/jimhester/lintr#available-linters - linter_rules_configuration_url: https://github.com/jimhester/lintr#project-configuration + linter_url: https://lintr.r-lib.org/ + linter_rules_url: https://lintr.r-lib.org/reference/index.html + linter_rules_configuration_url: https://lintr.r-lib.org/articles/lintr.html#configuring-linters config_file_name: .lintr linter_version_cache: "0.0.0" examples: @@ -43,4 +43,4 @@ linters: url: https://github.com/dense-analysis/ale vscode: - name: VsCode R LSP - url: https://marketplace.visualstudio.com/items?itemName=REditorSupport.r-lsp + url: https://marketplace.visualstudio.com/items?itemName=REditorSupport.r diff --git a/megalinter/linters/RLinter.py b/megalinter/linters/RLinter.py index 606e1258dab..001adfe2973 100644 --- a/megalinter/linters/RLinter.py +++ b/megalinter/linters/RLinter.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Use lintr to lint R files -https://github.com/jimhester/lintr +https://github.com/r-lib/lintr """ import os from shutil import copyfile From aab669acd1544752e9cb5dbdf314362e65fff07d Mon Sep 17 00:00:00 2001 From: nvuillam Date: Wed, 8 Jun 2022 16:23:24 +0200 Subject: [PATCH 2/2] Build (updates must be performed only in YML descriptor, the rest is generated automatically) --- docs/all_linters.md | 2 +- docs/descriptors/r_lintr.md | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/all_linters.md b/docs/all_linters.md index 73516b650ca..37880891154 100644 --- a/docs/all_linters.md +++ b/docs/all_linters.md @@ -41,7 +41,7 @@ | [**ktlint**](https://github.com/pinterest/ktlint){target=_blank} | 0.45.2 | [MIT](licenses/ktlint.md) | [KOTLIN](descriptors/kotlin_ktlint.md) | :heart: | [MegaLinter reference](https://github.com/pinterest/ktlint#-with-continuous-integration){target=_blank} | | [**kubeconform**](https://github.com/yannh/kubeconform){target=_blank} | 0.4.12 | [Other](licenses/kubeconform.md) | [KUBERNETES](descriptors/kubernetes_kubeconform.md) | :white_circle: | [Repository](https://github.com/yannh/kubeconform){target=_blank} | | [**kubeval**](https://github.com/instrumenta/kubeval){target=_blank} | 0.16.1 | [Other](licenses/kubeval.md) | [KUBERNETES](descriptors/kubernetes_kubeval.md) | :white_circle: | [Repository](https://github.com/instrumenta/kubeval){target=_blank} | -| [**lintr**](https://github.com/r-lib/lintr){target=_blank} | N/A | | [R](descriptors/r_lintr.md) | :white_circle: | [Web Site](https://github.com/r-lib/lintr){target=_blank} | +| [**lintr**](https://lintr.r-lib.org/){target=_blank} | N/A | | [R](descriptors/r_lintr.md) | :white_circle: | [Web Site](https://lintr.r-lib.org/){target=_blank} | | [**luacheck**](https://github.com/luarocks/luacheck){target=_blank} | 0.26.1 | [MIT](licenses/luacheck.md) | [LUA](descriptors/lua_luacheck.md) | :no_entry_sign: | [Repository](https://github.com/luarocks/luacheck){target=_blank} | | [**markdown-link-check**](https://github.com/tcort/markdown-link-check){target=_blank} | 3.10.2 | | [MARKDOWN](descriptors/markdown_markdown_link_check.md) | :heart: | [MegaLinter reference](https://github.com/tcort/markdown-link-check#run-in-other-tools){target=_blank} | | [**markdown-table-formatter**](https://github.com/nvuillam/markdown-table-formatter){target=_blank} | 1.3.0 | [MIT](licenses/markdown-table-formatter.md) | [MARKDOWN](descriptors/markdown_markdown_table_formatter.md) | :white_circle: | [Repository](https://github.com/nvuillam/markdown-table-formatter){target=_blank} | diff --git a/docs/descriptors/r_lintr.md b/docs/descriptors/r_lintr.md index 3d38da6b10c..d8ff403ddd8 100644 --- a/docs/descriptors/r_lintr.md +++ b/docs/descriptors/r_lintr.md @@ -9,8 +9,6 @@ - If custom `.lintr` config file is not found, [.lintr](https://github.com/megalinter/megalinter/tree/main/TEMPLATES/.lintr){target=_blank} will be used - See [Index of problems detected by lintr](https://lintr.r-lib.org/reference/index.html){target=_blank} -[![lintr - GitHub](https://gh-card.dev/repos/r-lib/lintr.svg?fullname=)](https://github.com/r-lib/lintr){target=_blank} - ## Configuration in MegaLinter - Enable lintr by adding `R_LINTR` in [ENABLE_LINTERS variable](https://megalinter.github.io/configuration/#activation-and-deactivation) @@ -35,14 +33,14 @@ Use lintr in your favorite IDE to catch errors before MegaLinter ! -| | IDE | Extension Name | Install | -|:--------------------------------------------------------------------------------------------------------------------------------------------:|------------------------------------------------------|------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| -| | [Atom](https://atom.io/) | [Atom lintr](https://github.com/AtomLinter/linter-lintr) | [Visit Web Site](https://github.com/AtomLinter/linter-lintr){target=_blank} | -| | [Emacs](https://www.gnu.org/software/emacs/) | [flycheck](http://www.flycheck.org/en/latest/languages.html#r) | [Visit Web Site](http://www.flycheck.org/en/latest/languages.html#r){target=_blank} | -| | rstudio | [Native Support](https://rstudio.com/) | [Visit Web Site](https://rstudio.com/){target=_blank} | -| | [Sublime Text](https://www.sublimetext.com/) | [SublimeLinter-contrib-lintr](https://github.com/jimhester/SublimeLinter-contrib-lintr) | [Visit Web Site](https://github.com/jimhester/SublimeLinter-contrib-lintr){target=_blank} | -| | [vim](https://www.vim.org/) | [ale](https://github.com/dense-analysis/ale) | [Visit Web Site](https://github.com/dense-analysis/ale){target=_blank} | -| | [Visual Studio Code](https://code.visualstudio.com/) | [VsCode R](https://marketplace.visualstudio.com/items?itemName=REditorSupport.r) | [![Install in VsCode](https://github.com/megalinter/megalinter/raw/main/docs/assets/images/btn_install_vscode.png)](vscode:extension/REditorSupport.r){target=_blank} | +| | IDE | Extension Name | Install | +|:--------------------------------------------------------------------------------------------------------------------------------------------:|------------------------------------------------------|-----------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------:| +| | [Atom](https://atom.io/) | [Atom lintr](https://github.com/AtomLinter/linter-lintr) | [Visit Web Site](https://github.com/AtomLinter/linter-lintr){target=_blank} | +| | [Emacs](https://www.gnu.org/software/emacs/) | [flycheck](http://www.flycheck.org/en/latest/languages.html#r) | [Visit Web Site](http://www.flycheck.org/en/latest/languages.html#r){target=_blank} | +| | rstudio | [Native Support](https://rstudio.com/) | [Visit Web Site](https://rstudio.com/){target=_blank} | +| | [Sublime Text](https://www.sublimetext.com/) | [SublimeLinter-contrib-lintr](https://github.com/jimhester/SublimeLinter-contrib-lintr) | [Visit Web Site](https://github.com/jimhester/SublimeLinter-contrib-lintr){target=_blank} | +| | [vim](https://www.vim.org/) | [ale](https://github.com/dense-analysis/ale) | [Visit Web Site](https://github.com/dense-analysis/ale){target=_blank} | +| | [Visual Studio Code](https://code.visualstudio.com/) | [VsCode R LSP](https://marketplace.visualstudio.com/items?itemName=REditorSupport.r) | [![Install in VsCode](https://github.com/megalinter/megalinter/raw/main/docs/assets/images/btn_install_vscode.png)](vscode:extension/REditorSupport.r){target=_blank} | ## MegaLinter Flavours