From a7df5f25267baf733db93f018f5800bfbc2c8206 Mon Sep 17 00:00:00 2001 From: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Date: Sat, 4 Jan 2025 05:40:06 -0800 Subject: [PATCH] Fixes prettier file associations (#88832) ## About The Pull Request Small change that not only saves a few lines from our current config but also enforces prettier on other file types (INSIDE tgui). VS Code is kind of confusing in re: formatter settings and which setting takes precedence. I've learned that adding this just fixes weirdness with user-set formatters. This overrides local configuration, which we are trying to do anyway with .editorconfig. Based on [this informative tweet](https://x.com/colinhacks/status/1841934672647094599) by colinhacks, creator of zod ## Why It's Good For The Game More PRs can pass linters on CI ## Changelog N/A --- .vscode/settings.json | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0ef2ce67760..ff41d606550 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,27 +18,7 @@ "git.branchProtection": ["master"], "gitlens.advanced.blame.customArguments": ["-w"], "tgstationTestExplorer.project.resultsType": "json", - "[javascript]": { - "editor.rulers": [80], - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true - }, - "[javascriptreact]": { - "editor.rulers": [80], - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true - }, - "[typescript]": { - "editor.rulers": [80], - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true - }, - "[typescriptreact]": { - "editor.rulers": [80], - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true - }, - "[scss]": { + "[javascript][typescript][typescriptreact][javascriptreact][html][scss][css][json][jsonc][markdown][yaml]": { "editor.rulers": [80], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true