Fix issue#5

Author: iuyoy

CHANGELOG.md

@@ -4,35 +4,49 @@ All notable changes to the "highlight-string-code" extension will be documented
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+Develop slowly for features.
+
 ## TODO Notes
+
 - [x] Publish extension
 - [ ] Add switches for Highlight Signs
 - [x] Add Chinese usage
 
 ## [Realease]
 
+### [v0.4.5]
+
+- Modify js highlight pattern to fix [Issue#5](https://github.com/iuyoy/highlight-string-code/issues/5).
+
 ### [v0.4.4]
+
 - Add "\s*" pattern before some signs to fix [Issue#1](https://github.com/iuyoy/highlight-string-code/issues/1).
 
 ### [v0.4.3]
+
 - Add yaml support
 - Fix typos.
 
 ### [v0.4.2]
+
 - Add sign pair snippets for highlighting block.
 - Fix some typos.
 
 ### [v0.4.1]
+
 - Add Chinese Readme file.
 
 ### [v0.4.0]
+
 - Reconstitute language injections
 - Add embeddedLanguages and tokenTypes features to support commenting, bracket matching, auto closing pairs, snippet selection and so on.
 
 ### [v0.3.4]
+
 - Add a WHITESPACE in third SQL start matching rule.
 
 ## [Unreleased]
+
 - Ready to release
 - Keep variables highlighted between `{` and `}` in string code.
 - Add usages

README.md

@@ -1,6 +1,7 @@
 # Highlight String Code
 
 Highlight string as SQL, HTML, CSS or JavaScript in most languages.
+
 在代码中，高亮 SQL、HTML、CSS 或者 JavaScript 代码。
 
 ## Documents
@@ -27,7 +28,7 @@ Highlight string as SQL, HTML, CSS or JavaScript in most languages.
 | SQL      | `--beginsql`, `--endsql`      | `hsql`, `highlight-sql`       |
 | SQL      | `--begin-sql`, `--end-sql`    | -                             |
 | SQL      | UPPERCASE KEYWORD, `;`        | -                             |
-| Hive SQL | `--hive`, `--!hive`           | `hhsql`, `highlight-hive-sql` | [Hive SQL](https://marketplace.visualstudio.com/items?itemName=josephtbradley.hive-sql) is required 
+| Hive SQL | `--hive`, `--!hive`           | `hhsql`, `highlight-hive-sql` | [Hive SQL](https://marketplace.visualstudio.com/items?itemName=josephtbradley.hive-sql) is required
 | HTML     | `<!--html-->`, `<!--!html-->` | `hhtml`, `highlight-html`     |
 | CSS      | `/*css*/`, `/*!css*/`         | `hcss`, `highlight-css`       |
 | JS       | `//js`, `//!js`               | `hjs`, `highlight-javascript` |
@@ -52,25 +53,32 @@ Highlight string as SQL, HTML, CSS or JavaScript in most languages.
   - Type `h{language_abbr}` or `highlight-{language_name}` to insert a highlight block sign pair. For example, type `hjs` or `highlight-javascript` to insert `// js` and `// !js`. 
   ![Snippets](./docs/hjs-snippets.png)
 
-
 ## Installation
 
 - Install from VS Code extensions (`ctrl + shift + x` or `cmd + shift + x` on mac).
 - Install from [VSIX](https://github.com/iuyoy/highlight-string-code/releases) manually.
 
 ## Release Notes
 
+### [v0.4.5]
+
+- Modify js highlight pattern to fix [Issue#5](https://github.com/iuyoy/highlight-string-code/issues/5).
+
 ### [v0.4.4]
+
 - Add "\s*" pattern before some signs to fix [Issue#1](https://github.com/iuyoy/highlight-string-code/issues/1).
 
 ### [v0.4.3]
+
 - Add yaml support
 - Fix typos.
 
 Please see [CHANGELOG.md](./CHANGELOG.md) for more information.
 
 ## Issues
+
 If you have any suggestion or issue, please feel free to submit it at [Github Issues](https://github.com/iuyoy/highlight-string-code/issues) page.
+Any pull requests to add more features or improve the experience are also welcome.
 
 ## References
 

docs/README_CN.md

@@ -59,11 +59,16 @@ Highlight string as SQL, HTML, CSS or JavaScript in most languages.
 
 ## 更新日志
 
+### [v0.4.5]
+
+- 修改了高亮 js 的正则来修复 [Issue#5](https://github.com/iuyoy/highlight-string-code/issues/5).
+
 ### [v0.4.4]
-- 在语言标记前增加空白符匹配来修正[Issue#1](https://github.com/iuyoy/highlight-string-code/issues/1)
 
+- 在语言标记前增加空白符匹配来修正[Issue#1](https://github.com/iuyoy/highlight-string-code/issues/1)
 
 ### [v0.4.3]
+
 - 支持高亮 Yaml
 
 更多信息请见 [CHANGELOG.md](./CHANGELOG.md)

docs/demo.py

@@ -68,8 +68,15 @@
     return 123;
 };
 //!js
-var a = 1;
+
+http: // js
+var a = 2;
+// !js
+
+var a=1;
+://js
 alert(a);
+//!js
 console.log(a);
 function b() {
     return 123;

docs/demo.sh

@@ -70,8 +70,15 @@ function b() {
     return 123;
 };
 //!js
+
+http: // js
+var a = 2;
+// !js
+
 var a=1;
+://js
 alert(a);
+//!js
 console.log(a);
 function b() {
     return 123;

package.json

@@ -2,7 +2,7 @@
     "name": "highlight-string-code",
     "displayName": "Highlight String Code",
     "description": "Highlight string as SQL, HTML, CSS or JS in most languages. 高亮内嵌的SQL，HTML， CSS或者JS",
-    "version": "0.4.4",
+    "version": "0.4.5",
     "publisher": "iuyoy",
     "author": {
         "name": "iuyoy"

syntaxes/highlight-string-code.json

@@ -86,7 +86,7 @@
             ]
         },
         "highlight-string-js": {
-            "begin": "(\\s*// *(js)[^/]*)",
+            "begin": "(\\s*([^:]|^)// *(js)[^/]*)",
             "end": "(\\s*// *(\\!js)[^/]*)",
             "captures": {
                 "1": {