Merge main into comparison-improvement branch

TNO · Sep 25, 2023 · e2b5830 · e2b5830
2 parents 23d03d7 + e0cb632
commit e2b5830
Show file tree

Hide file tree

Showing 31 changed files with 5,566 additions and 3,960 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -6,6 +6,7 @@ module.exports = {
   root: true,
   rules: {
     "no-useless-escape": "off",
+    "no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
     "@typescript-eslint/no-non-null-assertion": "off",
     "@typescript-eslint/naming-convention": [
       "error",

diff --git a/.prettierignore b/.prettierignore
@@ -10,12 +10,4 @@ examples/
 README.md
 webpack.config.ts
 tsconfig.json
-src/extension
-src/viewer/hooks/
-src/viewer/rules/
-src/viewer/minimap/
-src/viewer/log/
-src/viewer/App.tsx
-src/viewer/index.tsx
-src/viewer/LogFile.tsx
-src/viewer/types.d.ts
+src/extension
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,4 +1,5 @@
 {
-	"tabWidth": 4,
-	"useTabs": true
+	"tabWidth": 2,
+	"useTabs": true,
+	"printWidth": 100
 }