From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
.prettierrc | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/.prettierrc b/.prettierrc
index 15683b6..449f1b9 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,13 +1,26 @@
{
- "trailingComma": "none",
- "overrides": [
- {
- "files": "**/lwc/**/*.html",
- "options": { "parser": "lwc" }
- },
- {
- "files": "*.{cmp,page,component}",
- "options": { "parser": "html" }
- }
- ]
-}
+ "trailingComma": "none",
+ "singleQuote": true,
+ "tabWidth": 4,
+ "overrides": [
+ {
+ "files": "**/lwc/**/*.html",
+ "options": {
+ "parser": "lwc"
+ }
+ },
+ {
+ "files": "**/*.{cls,trigger,apex}",
+ "options": {
+ "apexInsertFinalNewline": true,
+ "printWidth": 140
+ }
+ },
+ {
+ "files": "*.{cmp,page,component}",
+ "options": {
+ "parser": "html"
+ }
+ }
+ ]
+}
\ No newline at end of file
--
Gitblit v1.9.1