Merge pull request #1860 from keesschollaart81/dev

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-home-assistant",
   "displayName": "Home Assistant Config Helper",
   "description": " Completion for entity-id's in Home Assistant Configurations",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "preview": false,
   "engines": {
     "vscode": "^1.45.1"
@@ -80,21 +80,123 @@
     "languages": [
       {
         "id": "home-assistant",
-        "configuration": "./yaml-language/language-configuration.json",
+        "configuration": "./syntaxes/yaml-language-configuration.json",
         "extensions": [
           ".yml",
           ".yaml"
         ],
         "aliases": [
-          "Home Assistant"
+          "Home Assistant",
+          "homeassistant",
+          "home-assistant"
         ]
+      },
+      {
+        "comments": "unfortunately this dummy entry is necessary for embedding to work",
+        "id": "home-assistant-jinja",
+        "configuration": "./jinja-language-configuration.json"
       }
     ],
     "grammars": [
       {
+        "comments": [
+          "YAML syntax as base for Home Assistant",
+          "scopeName changed so that we can use it as base for injections"
+        ],
         "language": "home-assistant",
-        "scopeName": "source.yaml",
-        "path": "./yaml-language/yaml.tmLanguage.json"
+        "scopeName": "source.home-assistant",
+        "path": "./syntaxes/external/YAML.tmLanguage"
+      },
+      {
+        "comments": [
+          "Jinja syntax as injection into Home Assistant YAML",
+          "This is so that we do not need to rely on the Jinja extension being installed"
+        ],
+        "language": "home-assistant-jinja",
+        "scopeName": "source.home-assistant-jinja",
+        "path": "./syntaxes/external/jinja.tmLanguage.json"
+      },
+      {
+        "comments": [
+          "Highlighting of Home Assistant keywords in Jinja"
+        ],
+        "path": "./syntaxes/home-assistant/jinja-keywords.tmLanguage",
+        "scopeName": "injection.homeassistant.jinja-keywords",
+        "injectTo": [
+          "source.home-assistant"
+        ]
+      },
+      {
+        "comments": [
+          "Additional Jinja grammars"
+        ],
+        "path": "./syntaxes/home-assistant/jinja-extras.tmLanguage",
+        "scopeName": "injection.homeassistant.jinja-extras",
+        "injectTo": [
+          "source.home-assistant"
+        ]
+      },
+      {
+        "comments": [
+          "Support for Jinja in double curly braces"
+        ],
+        "path": "./syntaxes/home-assistant/jinja-braces.tmLanguage",
+        "scopeName": "injection.homeassistant.jinja-braces",
+        "embeddedLanguages": {
+          "meta.embedded.inline.jinja": "home-assistant-jinja"
+        },
+        "injectTo": [
+          "source.home-assistant"
+        ]
+      },
+      {
+        "comments": [
+          "Support for Jinja in single curly braces with percentage symbol"
+        ],
+        "path": "./syntaxes/home-assistant/jinja-braces-block.tmLanguage",
+        "scopeName": "injection.homeassistant.jinja-braces-block",
+        "embeddedLanguages": {
+          "meta.embedded.block.jinja": "home-assistant-jinja"
+        },
+        "injectTo": [
+          "source.home-assistant"
+        ]
+      },
+      {
+        "comments": [
+          "Support for Jinja in conditionals"
+        ],
+        "path": "./syntaxes/home-assistant/jinja-conditionals.tmLanguage",
+        "scopeName": "injection.homeassistant.jinja-conditionals",
+        "embeddedLanguages": {
+          "meta.embedded.inline.jinja": "home-assistant-jinja",
+          "meta.embedded.block.jinja": "home-assistant-jinja"
+        },
+        "injectTo": [
+          "source.home-assistant"
+        ]
+      },
+      {
+        "comments": [
+          "The quote escapes implemented in the conditionals injection do not work inside brackets etc.",
+          "Support for single quote escapes in Jinja"
+        ],
+        "path": "./syntaxes/home-assistant/jinja-single-quote-escape.tmLanguage",
+        "scopeName": "injection.homeassistant.jinja-single-quote-escape",
+        "injectTo": [
+          "source.home-assistant"
+        ]
+      },
+      {
+        "comments": [
+          "The quote escapes implemented in the conditionals injection do not work inside brackets etc.",
+          "Support for double quote escapes in Jinja"
+        ],
+        "path": "./syntaxes/home-assistant/jinja-double-quote-escape.tmLanguage",
+        "scopeName": "injection.homeassistant.jinja-double-quote-escape",
+        "injectTo": [
+          "source.home-assistant"
+        ]
       }
     ],
     "commands": [
@@ -336,7 +438,7 @@
     "eslint-plugin-react-hooks": "4.3.0",
     "eslint-plugin-wc": "^1.3.2",
     "husky": "^7.0.4",
-    "lint-staged": "^12.1.5",
+    "lint-staged": "^12.1.7",
     "prettier": "^2.5.1",
     "rimraf": "3.0.2",
     "ts-loader": "^8.0.10",
@@ -349,14 +451,14 @@
     "bufferutil": "^4.0.6",
     "home-assistant-js-websocket": "^6.0.1",
     "utf-8-validate": "^5.0.8",
-    "vscode-extension-telemetry": "0.4.4",
+    "vscode-extension-telemetry": "0.4.5",
     "vscode-json-languageservice": "^3.9.1",
     "vscode-languageclient": "6.1.3",
     "vscode-languageserver": "6.1.1",
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-languageserver-textdocument": "^1.0.2",
     "vscode-uri": "3.0.3",
-    "ws": "8.4.0",
+    "ws": "8.4.1",
     "yaml": "1.10.2",
     "yaml-language-server": "0.12.0"
   }

src/language-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "home-assistant-language-service",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "description": "Home Assistant Language Service",
   "source": "src/haLanguageService.ts",
   "main": "dist/haLanguageService.js",
@@ -70,7 +70,7 @@
     "vscode-json-languageservice": "3.9.1",
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-uri": "3.0.3",
-    "ws": "8.4.0",
+    "ws": "8.4.1",
     "yaml": "1.10.2",
     "yaml-language-server": "0.12.0"
   },

src/language-service/src/schemas/configuration.ts

@@ -203,6 +203,12 @@ export interface InternalIntegrations {
    */
   switch?: integrations.Core.Switch.Schema | IncludeList;
 
+  /**
+   * The template integration allows creating entities which derive their values from other data.
+   * https://www.home-assistant.io/integrations/template
+   */
+  template?: integrations.Core.Template.Schema | IncludeList;
+
   /**
    * The updater binary sensor will check daily for new releases.
    * https://www.home-assistant.io/integrations/updater
@@ -233,14 +239,6 @@ export interface CoreIntegrations {
    */
   cloud?: integrations.Core.Cloud.Schema | IncludeNamed | null;
 
-  /**
-   * DEPRECATED as of Home Assistant 0.113.0
-   *
-   * The Philips Hue integration allows you to control and monitor the lights and motion sensors connected to your Hue bridge.
-   * https://www.home-assistant.io/integrations/hue
-   */
-  hue?: integrations.Core.Hue.Schema | IncludeNamed;
-
   /**
    * The KNX integration for Home Assistant allows you to connect to KNX/IP devices.
    * https://www.home-assistant.io/integrations/knx