Fixes invalid JSON files and whitespace corrections in YAML files (#26396)

.devcontainer/devcontainer.json

@@ -1,35 +1,32 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-	"name": "Home Assistant Dev",
+  "name": "Home Assistant Dev",
-	"context": "..",
+  "context": "..",
-	"dockerFile": "../Dockerfile.dev",
+  "dockerFile": "../Dockerfile.dev",
-	"postCreateCommand": "pip3 install -e .",
+  "postCreateCommand": "pip3 install -e .",
-	"appPort": 8123,
+  "appPort": 8123,
-	"runArgs": [
+  "runArgs": ["-e", "GIT_EDITOR=\"code --wait\""],
-		"-e",
+  "extensions": [
-		"GIT_EDITOR=\"code --wait\""
+    "ms-python.python",
-	],
+    "ms-azure-devops.azure-pipelines",
-	"extensions": [
+    "redhat.vscode-yaml"
-		"ms-python.python",
+  ],
-		"ms-azure-devops.azure-pipelines",
+  "settings": {
-		"redhat.vscode-yaml"
+    "python.pythonPath": "/usr/local/bin/python",
-	],
+    "python.linting.pylintEnabled": true,
-	"settings": {
+    "python.linting.enabled": true,
-		"python.pythonPath": "/usr/local/bin/python",
+    "python.formatting.provider": "black",
-		"python.linting.pylintEnabled": true,
+    "editor.formatOnPaste": false,
-		"python.linting.enabled": true,
+    "editor.formatOnSave": true,
-		"python.formatting.provider": "black",
+    "editor.formatOnType": true,
-		"editor.formatOnPaste": false,
+    "files.trimTrailingWhitespace": true,
-		"editor.formatOnSave": true,
+    "terminal.integrated.shell.linux": "/bin/bash",
-		"editor.formatOnType": true,
+    "yaml.customTags": [
-		"files.trimTrailingWhitespace": true,
+      "!secret scalar",
-		"terminal.integrated.shell.linux": "/bin/bash",
+      "!include_dir_named scalar",
-		"yaml.customTags": [
+      "!include_dir_list scalar",
-			"!secret scalar",
+      "!include_dir_merge_list scalar",
-			"!include_dir_named scalar",
+      "!include_dir_merge_named scalar"
-			"!include_dir_list scalar",
+    ]
-			"!include_dir_merge_list scalar",
+  }
-			"!include_dir_merge_named scalar"
+}
-		]
-	}
-}

.vscode/tasks.json

@@ -1,92 +1,90 @@
 {
-    "version": "2.0.0",
+  "version": "2.0.0",
-    "tasks": [
+  "tasks": [
-        {
+    {
-            "label": "Preview",
+      "label": "Preview",
-            "type": "shell",
+      "type": "shell",
-            "command": "hass -c ./config",
+      "command": "hass -c ./config",
-            "group": {
+      "group": {
-                "kind": "test",
+        "kind": "test",
-                "isDefault": true,
+        "isDefault": true
-            },
+      },
-            "presentation": {
+      "presentation": {
-                "reveal": "always",
+        "reveal": "always",
-                "panel": "new"
+        "panel": "new"
-            },
+      },
-            "problemMatcher": []
+      "problemMatcher": []
-        },
+    },
-        {
+    {
-            "label": "Pytest",
+      "label": "Pytest",
-            "type": "shell",
+      "type": "shell",
-            "command": "pytest --timeout=10 tests",
+      "command": "pytest --timeout=10 tests",
-            "group": {
+      "group": {
-                "kind": "test",
+        "kind": "test",
-                "isDefault": true,
+        "isDefault": true
-            },
+      },
-            "presentation": {
+      "presentation": {
-                "reveal": "always",
+        "reveal": "always",
-                "panel": "new"
+        "panel": "new"
-            },
+      },
-            "problemMatcher": []
+      "problemMatcher": []
-        },
+    },
-        {
+    {
-            "label": "Flake8",
+      "label": "Flake8",
-            "type": "shell",
+      "type": "shell",
-            "command": "flake8 homeassistant tests",
+      "command": "flake8 homeassistant tests",
-            "group": {
+      "group": {
-                "kind": "test",
+        "kind": "test",
-                "isDefault": true,
+        "isDefault": true
-            },
+      },
-            "presentation": {
+      "presentation": {
-                "reveal": "always",
+        "reveal": "always",
-                "panel": "new"
+        "panel": "new"
-            },
+      },
-            "problemMatcher": []
+      "problemMatcher": []
-        },
+    },
-        {
+    {
-            "label": "Pylint",
+      "label": "Pylint",
-            "type": "shell",
+      "type": "shell",
-            "command": "pylint homeassistant",
+      "command": "pylint homeassistant",
-            "dependsOn": [
+      "dependsOn": ["Install all Requirements"],
-                "Install all Requirements"
+      "group": {
-            ],
+        "kind": "test",
-            "group": {
+        "isDefault": true
-                "kind": "test",
+      },
-                "isDefault": true,
+      "presentation": {
-            },
+        "reveal": "always",
-            "presentation": {
+        "panel": "new"
-                "reveal": "always",
+      },
-                "panel": "new"
+      "problemMatcher": []
-            },
+    },
-            "problemMatcher": []
+    {
-        },
+      "label": "Generate Requirements",
-        {
+      "type": "shell",
-            "label": "Generate Requirements",
+      "command": "./script/gen_requirements_all.py",
-            "type": "shell",
+      "group": {
-            "command": "./script/gen_requirements_all.py",
+        "kind": "build",
-            "group": {
+        "isDefault": true
-                "kind": "build",
+      },
-                "isDefault": true
+      "presentation": {
-            },
+        "reveal": "always",
-            "presentation": {
+        "panel": "new"
-                "reveal": "always",
+      },
-                "panel": "new"
+      "problemMatcher": []
-            },
+    },
-            "problemMatcher": []
+    {
-        },
+      "label": "Install all Requirements",
-        {
+      "type": "shell",
-            "label": "Install all Requirements",
+      "command": "pip3 install -r requirements_all.txt -c homeassistant/package_constraints.txt",
-            "type": "shell",
+      "group": {
-            "command": "pip3 install -r requirements_all.txt -c homeassistant/package_constraints.txt",
+        "kind": "build",
-            "group": {
+        "isDefault": true
-                "kind": "build",
+      },
-                "isDefault": true
+      "presentation": {
-            },
+        "reveal": "always",
-            "presentation": {
+        "panel": "new"
-                "reveal": "always",
+      },
-                "panel": "new"
+      "problemMatcher": []
-            },
+    }
-            "problemMatcher": []
+  ]
-        }
-    ]
 }

homeassistant/components/ihc/ihc_auto_setup.yaml

@@ -1,6 +1,6 @@
 # IHC auto setup configuration.
 # To customize this, copy this file to the home assistant configuration
-# folder and make your changes. 
+# folder and make your changes.
 
 binary_sensor:
     # Magnet contact

homeassistant/components/knx/services.yaml

@@ -1,9 +1,9 @@
 send:
   description: "Send arbitrary data directly to the KNX bus."
   fields:
-    address: 
+    address:
       description: "Group address(es) to write to."
       example: "1/1/0"
-    payload: 
+    payload:
       description: "Payload to send to the bus. Integers are treated as DPT 1/2/3 payloads. For DPTs > 6 bits send a list. Each value represents 1 octet (0-255). Pad with 0 to DPT byte length."
       example: "[0, 4]"

homeassistant/components/lcn/services.yaml

@@ -14,7 +14,7 @@ output_abs:
       example: 50
     transition:
       description: Transition time in seconds
-      example: 5  
+      example: 5
 
 output_rel:
   description: Set relative brightness of output port in percent.
@@ -30,7 +30,7 @@ output_rel:
       example: 50
     transition:
       description: Transition time in seconds
-      example: 5  
+      example: 5
 
 output_toggle:
   description: Toggle output port.
@@ -43,7 +43,7 @@ output_toggle:
       example: "output1"
     transition:
       description: Transition time in seconds
-      example: 5  
+      example: 5
 
 relays:
   description: Set the relays status.
@@ -72,7 +72,7 @@ led:
         - off
         - blink
         - flicker
-  
+
 var_abs:
   description: Set absolute value of a variable or setpoint.
   fields:
@@ -88,7 +88,7 @@ var_abs:
     unit_of_measurement:
       description: Unit of value
       example: 'celsius'
-      
+
 var_reset:
   description: Reset value of variable or setpoint.
   fields:
@@ -98,7 +98,7 @@ var_reset:
     variable:
       description: Variable or setpoint name
       example: 'var1'
-      
+
 var_rel:
   description: Shift value of a variable, setpoint or threshold.
   fields:
@@ -188,7 +188,7 @@ dyn_text:
     text:
       description: Text to send (up to 60 characters encoded as UTF-8)
       example: 'text up to 60 characters'
- 
+
 pck:
   description: Send arbitrary PCK command.
   fields:
@@ -198,4 +198,3 @@ pck:
     pck:
       description: PCK command (without address header)
       example: 'PIN4'
-  

homeassistant/components/persistent_notification/services.yaml

@@ -17,7 +17,7 @@ dismiss:
     notification_id:
       description: Target ID of the notification, which should be removed. [Required]
       example: 1234
-      
+
 mark_read:
   description: Mark a notification read.
   fields:

homeassistant/components/point/strings.json

@@ -29,4 +29,4 @@
       "authorize_url_fail": "Unknown error generating an authorize url."
     }
   }
-} 
+}

homeassistant/components/solax/manifest.json

@@ -8,4 +8,3 @@
     "dependencies": [],
     "codeowners": ["@squishykid"]
   }
-  

homeassistant/components/utility_meter/services.yaml

@@ -4,21 +4,21 @@ reset:
   description: Resets the counter of an utility meter.
   fields:
     entity_id:
-      description: Name(s) of the utility meter to reset 
+      description: Name(s) of the utility meter to reset
       example: 'utility_meter.energy'
 
 next_tariff:
   description: Changes the tariff to the next one.
   fields:
     entity_id:
-      description: Name(s) of entities to reset 
+      description: Name(s) of entities to reset
       example: 'utility_meter.energy'
 
 select_tariff:
   description: selects the current tariff of an utility meter.
   fields:
     entity_id:
-      description: Name of the entity to set the tariff for 
+      description: Name of the entity to set the tariff for
       example: 'utility_meter.energy'
     tariff:
       description: Name of the tariff to switch to

homeassistant/components/zha/services.yaml

@@ -18,19 +18,19 @@ remove:
       example: "00:0d:6f:00:05:7d:2d:34"
 
 reconfigure_device:
-  description: >- 
+  description: >-
-    Reconfigure ZHA device (heal device). Use this if you are having issues 
+    Reconfigure ZHA device (heal device). Use this if you are having issues
     with the device. If the device in question is a battery powered device
     please ensure it is awake and accepting commands when you use this
-    service. 
+    service.
   fields:
     ieee_address:
       description: IEEE address of the device to reconfigure
       example: "00:0d:6f:00:05:7d:2d:34"
 
 set_zigbee_cluster_attribute:
-  description: >- 
+  description: >-
-    Set attribute value for the specified cluster on the specified entity. 
+    Set attribute value for the specified cluster on the specified entity.
   fields:
     ieee:
       description: IEEE address for the device
@@ -55,8 +55,8 @@ set_zigbee_cluster_attribute:
       example: 0x00FC
 
 issue_zigbee_cluster_command:
-  description: >- 
+  description: >-
-    Issue command on the specified cluster on the specified entity. 
+    Issue command on the specified cluster on the specified entity.
   fields:
     ieee:
       description: IEEE address for the device

tests/fixtures/ring_oauth.json

@@ -1,8 +1,8 @@
 {
-    "access_token": "eyJ0eWfvEQwqfJNKyQ9999", 
+    "access_token": "eyJ0eWfvEQwqfJNKyQ9999",
     "token_type": "bearer",
     "expires_in": 3600,
     "refresh_token": "67695a26bdefc1ac8999",
-    "scope": "client", 
+    "scope": "client",
     "created_at": 1529099870
 }