From 9a046783997a2591d1c3253a250fb7afad08a460 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Thu, 8 Jun 2023 16:28:58 -0400 Subject: [PATCH] Validated JSON formatting on 287 files. --- .vscode/settings.json | 192 ++++++++++++--------- example_mods/introMod/_polymod_meta.json | 8 +- example_mods/testing123/_polymod_meta.json | 8 +- hmm.json | 2 +- 4 files changed, 125 insertions(+), 85 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d7433698d..dd4cd7aef 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,84 +1,120 @@ { - "[haxe]": { - // Automatically keep Haxe files formatted. - "editor.formatOnSave": true, - "editor.formatOnPaste": true, - "editor.codeActionsOnSave": { - // Compilation server issues can cause auto-cleanup to remove valid imports. - "source.organizeImports": false - }, - "editor.defaultFormatter": "nadako.vshaxe", - "editor.tabSize": 2 + "[haxe]": { + // Automatically keep Haxe files formatted. + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "editor.codeActionsOnSave": { + // Compilation server issues can cause auto-cleanup to remove valid imports. + "source.organizeImports": false }, - - "[json]": { - // Automatically keep JSON files formatted. - "editor.formatOnSave": true, - "editor.formatOnPaste": true, - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "nadako.vshaxe", + "editor.tabSize": 2 + }, + + "[json]": { + // Automatically keep JSON files formatted. + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + + "[jsonc]": { + // Automatically keep JSONC files formatted. + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "prettier.tabWidth": 2, + + // XML formatting style configuration + "xml.format.enabled": true, + "xml.format.legacy": false, + "xml.format.emptyElements": "collapse", + "xml.preferences.quoteStyle": "double", + "xml.format.enforceQuoteStyle": "preferred", + "xml.format.preserveAttributeLineBreaks": false, + "xml.format.preservedNewlines": 0, + "xml.format.splitAttributes": false, + "xml.format.joinCDATALines": true, + "xml.format.preserveEmptyContent": false, + "xml.format.joinCommentLines": false, + "xml.format.joinContentLines": false, + "xml.format.spaceBeforeEmptyCloseTag": true, + "xml.format.xsiSchemaLocationSplit": "onPair", + "xml.format.splitAttributesIndentSize": 2, + "xml.format.closingBracketNewLine": false, + "xml.format.preserveSpace": [ + "xsl:text", + "xsl:comment", + "xsl:processing-instruction", + "literallayout", + "programlisting", + "screen", + "synopsis", + "pre", + "xd:pre" + ], + "xml.format.maxLineWidth": 0, + "xml.format.grammarAwareFormatting": true, + + // Generic file formatting style configuration + "files.insertFinalNewline": true, + "files.trimFinalNewlines": false, + "files.trimTrailingWhitespace": true, + + // Automatically detect indentation. + "editor.detectIndentation": true, + "editor.insertSpaces": true, + "editor.tabSize": 2, + + // Automatically enforce Linux style line endings. + "files.eol": "\n", + + "haxe.displayPort": "auto", + "haxe.enableCompilationServer": true, + "haxe.displayServer": { + "arguments": ["-v"] + }, + // Fix file associations for HScript. + "files.associations": { + "*.hxp": "haxe", + "*.hscript": "haxe", + "*.haxe": "haxe", + "*.hxs": "haxe", + "*.hxc": "haxe" + }, + "projectManager.git.baseFolders": ["./"], + + "haxecheckstyle.sourceFolders": ["src", "Source"], + "haxecheckstyle.externalSourceRoots": [], + "haxecheckstyle.configurationFile": "checkstyle.json", + "haxecheckstyle.codeSimilarityBufferSize": 100, + + "lime.targetConfigurations": [ + { + "label": "Windows / Debug", + "target": "windows", + "args": ["-debug"] }, - - "[jsonc]": { - // Automatically keep JSONC files formatted. - "editor.formatOnSave": true, - "editor.formatOnPaste": true, - "editor.defaultFormatter": "esbenp.prettier-vscode" + { + "label": "Windows / Debug (DEBUG ASSETS)", + "target": "windows", + "args": ["-debug", "-DDEBUG_ASSETS"] }, - "prettier.tabWidth": 2, - - // Automatically detect indentation. - "editor.detectIndentation": true, - "editor.insertSpaces": true, - "editor.tabSize": 2, - - // Automatically enforce Linux style line endings. - "files.eol": "\n", - - "haxe.displayPort": "auto", - "haxe.enableCompilationServer": true, - "haxe.displayServer": { - "arguments": ["-v"] + { + "label": "Windows / Debug (ANIMATE)", + "target": "windows", + "args": ["-debug", "-DANIMATE"] }, - // Fix file associations for HScript. - "files.associations": { - "*.hxp": "haxe", - "*.hscript": "haxe", - "*.haxe": "haxe", - "*.hxs": "haxe", - "*.hxc": "haxe" + { + "label": "HTML5 / Debug", + "target": "html5", + "args": ["-debug"] }, - "projectManager.git.baseFolders": ["./"], - - "haxecheckstyle.sourceFolders": ["src", "Source"], - "haxecheckstyle.externalSourceRoots": [], - "haxecheckstyle.configurationFile": "checkstyle.json", - "haxecheckstyle.codeSimilarityBufferSize": 100, - - "lime.targetConfigurations": [ - { - "label": "Windows / Debug", - "target": "windows", - "args": ["-debug"] - }, - { - "label": "Windows / Debug (DEBUG ASSETS)", - "target": "windows", - "args": ["-debug", "-DDEBUG_ASSETS"] - }, - { - "label": "Windows / Debug (ANIMATE)", - "target": "windows", - "args": ["-debug", "-DANIMATE"] - }, - { - "label": "HTML5 / Debug", - "target": "html5", - "args": ["-debug"] - }, - { - "label": "HTML5 / Debug (Watch)", - "target": "html5", - "args": ["-debug", "-watch"] - } - ] - } \ No newline at end of file + { + "label": "HTML5 / Debug (Watch)", + "target": "html5", + "args": ["-debug", "-watch"] + } + ] +} diff --git a/example_mods/introMod/_polymod_meta.json b/example_mods/introMod/_polymod_meta.json index 4c7fd742e..e0b03f1cd 100644 --- a/example_mods/introMod/_polymod_meta.json +++ b/example_mods/introMod/_polymod_meta.json @@ -1,9 +1,11 @@ { "title": "Intro Mod", "description": "An introductory mod.", - "contributors": [{ - "name": "MasterEric" - }], + "contributors": [ + { + "name": "MasterEric" + } + ], "api_version": "0.1.0", "mod_version": "1.0.0", "license": "Apache-2.0" diff --git a/example_mods/testing123/_polymod_meta.json b/example_mods/testing123/_polymod_meta.json index 1a7766820..4c0f177f9 100644 --- a/example_mods/testing123/_polymod_meta.json +++ b/example_mods/testing123/_polymod_meta.json @@ -1,9 +1,11 @@ { "title": "Testing123", "description": "Newgrounds? More like OLDGROUNDS lol.", - "contributors": [{ - "name": "MasterEric" - }], + "contributors": [ + { + "name": "MasterEric" + } + ], "api_version": "0.1.0", "mod_version": "1.0.0", "license": "Apache-2.0" diff --git a/hmm.json b/hmm.json index e92868545..b07f8c50a 100644 --- a/hmm.json +++ b/hmm.json @@ -118,4 +118,4 @@ "version": "0.2.2" } ] -} \ No newline at end of file +}