From f89021e89d00de65c8be2cb5c5bdf9f0b0dfbda5 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Dec 2023 13:42:08 +0100 Subject: [PATCH] DX: activate VSCode multi-file diff editor (#250) https://code.visualstudio.com/updates/v1_85\#_multifile-diff-editor --- .vscode/settings.json | 1 + src/repoma/check_dev_files/vscode.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index e082ddd9..31c5a4ab 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -42,6 +42,7 @@ "git.rebaseWhenSync": true, "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], "livePreview.defaultPreviewPath": "docs/_build/html", + "multiDiffEditor.experimental.enabled": true, "mypy-type-checker.args": ["--config-file=${workspaceFolder}/pyproject.toml"], "mypy-type-checker.importStrategy": "fromEnvironment", "python.analysis.autoImportCompletions": false, diff --git a/src/repoma/check_dev_files/vscode.py b/src/repoma/check_dev_files/vscode.py index 9911f053..24493ce7 100644 --- a/src/repoma/check_dev_files/vscode.py +++ b/src/repoma/check_dev_files/vscode.py @@ -40,6 +40,7 @@ def _update_settings(has_notebooks: bool) -> None: { "diffEditor.experimental.showMoves": True, "editor.formatOnSave": True, + "multiDiffEditor.experimental.enabled": True, "rewrap.wrappingColumn": 88, # black }, )