From 23e67a23a7b57fa5cb6fc92bd0843c3707d56ef9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Jun 2024 15:38:37 +0200
Subject: Adding upstream version 24.6.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .vscode/extensions.json | 16 ++++++++--------
 .vscode/settings.json   | 22 ++++++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to '.vscode')

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index aa1e537..ca0ca52 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,19 +1,19 @@
 {
   "recommendations": [
-    "Tyriar.sort-lines",
     "charliermarsh.ruff",
     "esbenp.prettier-vscode",
-    "hbenl.vscode-test-explorer",
-    "ms-python.isort",
+    "markis.code-coverage",
+    "ms-python.black-formatter",
+    "ms-python.debugpy",
+    "ms-python.mypy-type-checker",
+    "ms-python.pylint",
     "ms-python.python",
-    "ms-python.vscode-pylance",
-    "ms-vscode.live-server",
     "redhat.ansible",
     "redhat.vscode-yaml",
-    "ryanluker.vscode-coverage-gutters",
     "shardulm94.trailing-spaces",
+    "streetsidesoftware.code-spell-checker",
     "tamasfe.even-better-toml",
-    "timonwong.shellcheck",
     "znck.grammarly"
-  ]
+  ],
+  "unwantedRecommendations": ["ryanluker.vscode-coverage-gutters"]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 990033d..a4369f3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,13 +1,17 @@
 {
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[python]": {
     "editor.codeActionsOnSave": {
       "source.fixAll": "explicit",
-      "source.fixAll.ruff": "never",
-      "source.organizeImports": "never"
-    }
+      "source.organizeImports": "explicit"
+    },
+    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.formatOnSave": true
   },
   "editor.formatOnSave": true,
   "evenBetterToml.formatter.alignComments": false,
@@ -24,17 +28,15 @@
   "grammarly.files.include": ["**/*.txt", "**/*.md"],
   "grammarly.hideUnavailablePremiumAlerts": true,
   "grammarly.showExamples": true,
+  "markiscodecoverage.searchCriteria": "coverage.lcov",
+  "mypy-type-checker.importStrategy": "fromEnvironment",
+  "mypy-type-checker.preferDaemon": true,
+  "mypy-type-checker.reportingScope": "workspace",
   "python.analysis.exclude": ["build"],
-  "python.formatting.provider": "black",
-  "python.linting.flake8Args": ["--ignore=E501,W503"],
-  "python.linting.flake8Enabled": false,
-  "python.linting.mypyCategorySeverity.error": "Warning",
-  "python.linting.mypyEnabled": true,
-  "python.linting.pylintEnabled": true,
   "python.terminal.activateEnvironment": true,
+  "python.testing.pytestArgs": ["tests"],
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,
-  "sortLines.filterBlankLines": true,
   "yaml.completion": true,
   "yaml.customTags": ["!encrypted/pkcs1-oaep scalar", "!vault scalar"],
   "yaml.format.enable": false,
-- 
cgit v1.2.3