Merge branch 'debugging'

Author: Peter Weir

CHANGELOG.md

@@ -5,55 +5,6 @@ The format is based on [Keep a Changelog] (http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
-## [1.0.0] - 2018-02-02
+## [0.0.1] - 2018-03-28
 ### Added
-- Syntax highlighting for html in es6 multiline strings
-
-## [1.1.0] - 2018-03-08
-### Fixed
-- Compatibility with Prettier
-
-## [1.2.0] - 2018-03-12
-### Added
-- Commands and keybindings
-
-## [1.3.0] - 2018-03-17
-### Added
-- Syntax highlight without a comment
-- Follow semver
-
-### [1.4.0] - 2018-03-22
-### Added
-- JS Syntax highlight
-- Single-line comment support
-
-### [1.5.0] - 2018-03-22
-### Fixed
-- Compatibility with Prettier
-
-### [1.6.0] - 2018-08-13
-### Added
-- SQL support. Beta
-
-### [1.7.0] - 2018-08-14
-### Fixed
-- Improve html function support
-
-### [1.7.1] - 2018-08-15
-### Fixed
-- Improve single-line comments support
-- Disable hotkeys
-
-### [1.8.1] - 2018-08-18
-### Added
-- Unquoted attributes support
-### Fixed
-- Js-in-attributes support
-
-### [1.8.2] - 2018-08-19
-### Fixed
-- Fix missing `${}` syntax support in sql
-
-### [1.8.3] - 2018-08-25
-### Fixed
-- Fix broken multiline support for jquery
+- First working version

README.md

@@ -1,44 +1,28 @@
 # Python String HTML 
 > Hopefully ready to add to the VSCode Marketplace soon
 
-Adds syntax highlight support for code, placed in python multiline strings:
-- HTML (incl. html quoted and unquoted attrs)
-- SQL
+Adds syntax highlight support for code, placed in python multiline SQL strings
 
 ## Community
 - 2018-09-04 forked from [es6-string-css](https://github.com/bashmish/es6-string-css) - Highlight CSS in ES6 template literals
 
 ## Installation
 
-- Install `python-string-html` from extensions (`ctrl + shift + x`)
+- Install `python-string-sql` from extensions (`ctrl + shift + x`)
 
 ## Example
 
 ![Example](docs/demo.png)
 
 ## Usage
 
-Simply insert the comment /\*html\*/ or `html` (or sql instead of html) before the string
-(see Requirements "section" for possible values) or select
-`Insert python-string-html comment/template` from the commands menu
-(`ctrl+shift+p` or `f1`)
-
-> Tip: Comment in the beginning of python string is required
+Simply insert `--sql`, `--beginsql`, or `--begin-sql` at the beginning of the string
+and `--endsql` or `--end-sql` at the end of the string
 
 ## Requirements
 
-- Visual Studio Code v1.19.0 recommended
-- Comment `/*html*/` before the string. Possible values:
-- - `/*html*/`
-- - `/*inline-html*/`
-- - `/*template*/`
-- - `/*inline-template*/`
-- Or
-- - `html` before the string
-
-## Keybindings
-- `ctrl+shift+h` - Insert `/*html*/`
-- `ctrl+k h` - Insert `/*html*/` \`\`
+- Visual Studio Code v1.32.0 recommended
+- Comment `--sql` to start highlighting in the string. Possible values:
 
 ## Donation
 
@@ -48,6 +32,9 @@ If this project help you reduce time to develop, you can give the original devel
 
 ## Release Notes
 
+### [0.0.1] - 2018-09-04
+- Got it working based on [these instructions](https://code.visualstudio.com/api/language-extensions/syntax-highlight-guide)
+
 ### [0.0.0] - 2018-09-04
 - Forked from es6-string-html
 

docs/logo.png

@@ -1,95 +1,28 @@
 {
-  "name": "python-string-html",
-  "displayName": "python-string-html",
-  "description": "Syntax highlighting in Python multiline strings",
-  "version": "0.0.0",
-  "publisher": "ptweir",
-  "icon": "docs/logo.png",
-  "engines": {
-    "vscode": "^1.19.0"
-  },
-  "galleryBanner": {
-    "color": "#dedede",
-    "theme": "light"
-  },
-  "repository": {
-    "url": "https://github.com/ptweir/python-string-html"
-  },
-  "bugs": {
-    "url": "https://github.com/ptweir/python-string-html/issues"
-  },
-  "main": "./scripts/main",
-  "categories": [
-    "Languages"
-  ],
-  "keywords": [
-    "python",
-    "python3",
-    "python-string-html",
-    "html",
-    "sql"
-  ],
-  "activationEvents": [
-    "onCommand:pythonstringhtml.insertComment",
-    "onCommand:pythonstringhtml.insertTemplate"
-  ],
-  "contributes": {
-    "commands": [
-      {
-        "command": "pythonstringhtml.insertComment",
-        "title": "Insert python-string-html comment",
-        "category": "HTML"
+    "name": "python-string-sql",
+    "displayName": "python-string-sql",
+    "description": "highlight python strings as sql",
+    "version": "0.0.1",
+    "publisher": "ptweir",
+    "repository": {
+        "url": "https://github.com/ptweir/python-string-html"
       },
-      {
-        "command": "pythonstringhtml.insertTemplate",
-        "title": "Insert python-string-html template",
-        "category": "HTML"
-      }
+    "engines": {
+        "vscode": "^1.32.0"
+    },
+    "categories": [
+        "Programming Languages"
     ],
-    "grammars": [
-      {
-        "injectTo": [
-          "source.js",
-          "source.js.jsx",
-          "source.jsx",
-          "source.ts",
-          "source.tsx",
-          "source.sql",
-          "text.html.basic"
-        ],
-        "scopeName": "inline.es6-js-injection",
-        "path": "./syntaxes/es6-js-injection.json",
-        "embeddedLanguages": {
-          "meta.template.expression.ts": "typescript",
-          "meta.template.expression.js": "javascript"
-        }
-      },
-      {
-        "injectTo": [
-          "source.py",
-          "source.ts",
-          "source.tsx",
-          "text.html.basic"
-        ],
-        "scopeName": "inline.python-html",
-        "path": "./syntaxes/python-inline-html.json",
-        "embeddedLanguages": {
-          "meta.embedded.block.html": "html"
-        }
-      },
-      {
-        "injectTo": [
-          "source.py",
-          "source.ts",
-          "source.tsx",
-          "source.sql"
-        ],
-        "scopeName": "inline.python-sql",
-        "path": "./syntaxes/python-inline-sql.json",
-        "embeddedLanguages": {
-          "meta.embedded.sql": "sql"
-        }
+    "contributes": {
+        "grammars": [
+          {
+            "path": "./syntaxes/highlight-sql-string.json",
+            "scopeName": "python-sql.injection",
+            "injectTo": ["source.python"],
+            "embeddedLanguages": {
+                "meta.embedded.sql": "sql"
+              }
+          }
+        ]
       }
-    ]
-  }
-}
+}

package-lock.json

@@ -0,0 +1,27 @@
+{
+    "fileTypes": [
+      "py"
+    ],
+    "injectionSelector": "L:string.quoted.multi",
+    "patterns": [
+      {
+        "begin": "(--sql|--beginsql|--begin-sql)",
+        "end": "(--endsql|--end-sql)",
+        "beginCaptures": {
+          "1": {
+            "name": "variable.parameter"
+          }
+        },
+        "patterns": [
+          {
+            "include": "source.ts#template-substitution-element"
+          },
+          {
+            "include": "source.sql"
+          }
+        ]
+      }
+    ],
+    "scopeName": "python-sql.injection"
+  }
+