From cfd0865efcf201121cec0c26dc0da0e525ed8777 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Mon, 18 Jan 2021 11:27:57 +0100
Subject: [PATCH 1/3] init

---
 .../svelte-vscode/package-json-schema.json    |   9 ++
 packages/svelte-vscode/package.json           |  20 ++++
 .../prettier-options-schema.json              | 106 ++++++++++++++++++
 3 files changed, 135 insertions(+)
 create mode 100644 packages/svelte-vscode/package-json-schema.json
 create mode 100644 packages/svelte-vscode/prettier-options-schema.json

diff --git a/packages/svelte-vscode/package-json-schema.json b/packages/svelte-vscode/package-json-schema.json
new file mode 100644
index 000000000..3db9f6af0
--- /dev/null
+++ b/packages/svelte-vscode/package-json-schema.json
@@ -0,0 +1,9 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "properties": {
+        "prettier": {
+            "description": "Prettier-Plugin-Svelte configuration",
+            "$ref": "./prettier-options.json"
+        }
+    }
+}
diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json
index c30d29f62..b5cbff591 100644
--- a/packages/svelte-vscode/package.json
+++ b/packages/svelte-vscode/package.json
@@ -348,6 +348,26 @@
                     ".svelte"
                 ],
                 "configuration": "./language-configuration.json"
+            },
+            {
+                "id": "json",
+                "filenames": [
+                    ".prettierrc"
+                ]
+            }
+        ],
+        "jsonValidation": [
+            {
+                "fileMatch": ".prettierrc",
+                "url": "./prettier-options-schema.json"
+            },
+            {
+                "fileMatch": ".prettierrc.json",
+                "url": "./prettier-options-schema.json"
+            },
+            {
+                "fileMatch": "package.json",
+                "url": "./package-json-schema.json"
             }
         ],
         "grammars": [
diff --git a/packages/svelte-vscode/prettier-options-schema.json b/packages/svelte-vscode/prettier-options-schema.json
new file mode 100644
index 000000000..7963befa9
--- /dev/null
+++ b/packages/svelte-vscode/prettier-options-schema.json
@@ -0,0 +1,106 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "Prettier-plugin-svelte schema for .prettierrc",
+    "definitions": {
+        "optionsDefinition": {
+            "type": "object",
+            "properties": {
+                "svelteSortOrder": {
+                    "description": "Sort order for <svelte:options>, scripts, markup, and styles.",
+                    "default": "options-scripts-markup-styles",
+                    "enum": [
+                        "options-scripts-markup-styles",
+                        "options-scripts-styles-markup",
+                        "options-markup-scripts-styles",
+                        "options-markup-styles-scripts",
+                        "options-styles-scripts-markup",
+                        "options-styles-markup-scripts",
+                        "scripts-options-markup-styles",
+                        "scripts-options-styles-markup",
+                        "scripts-markup-options-styles",
+                        "scripts-markup-styles-options",
+                        "scripts-styles-options-markup",
+                        "scripts-styles-markup-options",
+                        "markup-options-scripts-styles",
+                        "markup-options-styles-scripts",
+                        "markup-scripts-options-styles",
+                        "markup-scripts-styles-options",
+                        "markup-styles-options-scripts",
+                        "markup-styles-scripts-options",
+                        "styles-options-scripts-markup",
+                        "styles-options-markup-scripts",
+                        "styles-scripts-options-markup",
+                        "styles-scripts-markup-options",
+                        "styles-markup-options-scripts",
+                        "styles-markup-scripts-options"
+                    ]
+                },
+                "svelteStrictMode": {
+                    "description": "More strict HTML syntax: less self-closed tags, quotes in attributes, no attribute shorthand (overrules svelteAllowShorthand).",
+                    "default": true,
+                    "type": "boolean"
+                },
+                "svelteBracketNewLine": {
+                    "description": "Put the > of a multiline element on a new line. Roughly the Svelte equivalent of the jsxBracketSameLine rule.",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "svelteAllowShorthand": {
+                    "description": "Option to enable/disable component attribute shorthand if attribute name and expression are same.",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "svelteIndentScriptAndStyle": {
+                    "description": "Whether or not to indent the code inside <script> and <style> tags in Svelte files. This saves an indentation level, but might break code folding in your editor.",
+                    "default": false,
+                    "type": "boolean"
+                }
+            }
+        },
+        "overridesDefinition": {
+            "type": "object",
+            "properties": {
+                "overrides": {
+                    "type": "array",
+                    "description": "Provide a list of patterns to override prettier configuration.",
+                    "items": {
+                        "type": "object",
+                        "required": ["files"],
+                        "properties": {
+                            "files": {
+                                "description": "Include these files in this override.",
+                                "oneOf": [
+                                    { "type": "string" },
+                                    { "type": "array", "items": { "type": "string" } }
+                                ]
+                            },
+                            "excludeFiles": {
+                                "description": "Exclude these files from this override.",
+                                "oneOf": [
+                                    { "type": "string" },
+                                    { "type": "array", "items": { "type": "string" } }
+                                ]
+                            },
+                            "options": {
+                                "type": "object",
+                                "description": "The options to apply for this override.",
+                                "$ref": "#/definitions/optionsDefinition"
+                            }
+                        },
+                        "additionalProperties": false
+                    }
+                }
+            }
+        }
+    },
+    "oneOf": [
+        {
+            "type": "object",
+            "allOf": [
+                { "$ref": "#/definitions/optionsDefinition" },
+                { "$ref": "#/definitions/overridesDefinition" }
+            ]
+        },
+        { "type": "string" }
+    ]
+}

From d716dfcfe9a9153314eaae480d8deed1867441a1 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:08:18 +0100
Subject: [PATCH 2/3] fix filepath

---
 packages/svelte-vscode/package-json-schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte-vscode/package-json-schema.json b/packages/svelte-vscode/package-json-schema.json
index 3db9f6af0..713c292bb 100644
--- a/packages/svelte-vscode/package-json-schema.json
+++ b/packages/svelte-vscode/package-json-schema.json
@@ -3,7 +3,7 @@
     "properties": {
         "prettier": {
             "description": "Prettier-Plugin-Svelte configuration",
-            "$ref": "./prettier-options.json"
+            "$ref": "./prettier-options-schema.json"
         }
     }
 }

From 864ff4e459e6f1823c05e5ce303f8834a706b129 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:11:02 +0100
Subject: [PATCH 3/3] add deprecated options for prettier-plugin-svelte 1.x
 users

---
 packages/svelte-vscode/prettier-options-schema.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/svelte-vscode/prettier-options-schema.json b/packages/svelte-vscode/prettier-options-schema.json
index 7963befa9..9df51ad56 100644
--- a/packages/svelte-vscode/prettier-options-schema.json
+++ b/packages/svelte-vscode/prettier-options-schema.json
@@ -32,7 +32,13 @@
                         "styles-scripts-options-markup",
                         "styles-scripts-markup-options",
                         "styles-markup-options-scripts",
-                        "styles-markup-scripts-options"
+                        "styles-markup-scripts-options",
+                        "scripts-markup-styles",
+                        "scripts-styles-markup",
+                        "markup-styles-scripts",
+                        "markup-scripts-styles",
+                        "styles-markup-scripts",
+                        "styles-scripts-markup"
                     ]
                 },
                 "svelteStrictMode": {