From 1d98d49b3e752a2850182dc51f792685358180a7 Mon Sep 17 00:00:00 2001
From: "Xuefeng Ding (IHEP)" <dingxf@ihep.ac.cn>
Date: Wed, 20 Nov 2024 14:38:54 +0800
Subject: [PATCH] fix
---
.pre-commit-config.yaml | 1 +
.vscode/settings.json | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2dff7dc..64d7df2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,6 +35,7 @@ repos:
hooks:
- id: ruff
args: ["--fix", "--exit-non-zero-on-fix", "--show-fixes"]
+ - id: ruff-format
- repo: https://github.com/cheshirekow/cmake-format-precommit
rev: v0.6.13
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7a2190d..25860b5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,19 +1,22 @@
{
+ "editor.rulers": [88],
+ "editor.defaultFormatter": "esbenp.prettier-vscode",
+ "editor.formatOnSave": true,
"[python]": {
"editor.codeActionsOnSave": {
- "source.organizeImports": "always"
+ "source.fixAll": "explicit"
},
- "editor.defaultFormatter": "ms-python.black-formatter"
- },
- "notebook.defaultFormatter": "ms-python.black-formatter",
- "notebook.codeActionsOnSave": {
- "source.organizeImports": "explicit"
+ "editor.defaultFormatter": "charliermarsh.ruff"
},
+ // "notebook.codeActionsOnSave": {
+ // "source.fixAll": "explicit"
+ // },
+ "notebook.defaultFormatter": "charliermarsh.ruff",
+ // "ruff.lint.args": ["--config=pyproject.toml"],
+ "ruff.fixAll": true,
"[cpp]": {
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
},
- "editor.formatOnSave": true,
- "isort.args": ["--profile", "black"],
"notebook.lineNumbers": "on",
"clangd.arguments": [
"--log=info",
--
GitLab