[pre-release] v3.3.0-beta-1

- 5 new themes added
- Minor fix for updated semantic token

Author: salbert11

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+#### **3.3.0**
+
+*18.02.2024 **Update***
+- Integrated with PineScript Color Themes extensions.
+- Hover popup fixed.
+- Grammars fixed.
+
+---
+
 #### **3.2.3**
 
 *27.12.2023 **Update***

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2018 JohnPapa.net, LLC
+Copyright (c) 2023-2024 salbert.g, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -4,10 +4,10 @@
 ## Language support for Pine Script V5 with Syntax Highlighting & Snippets
 
 ## Release Notes
-#### **3.2.3**
+#### **3.3.0**
 
-*27.12.2023 **Update***
-- Snippets for built-in variables, functions and constants updated to Pinescript release December 2023.
+*18.02.2024 **Update***
+- Integrated with PineScript Color Themes extension.
 - Hover popup fixed.
 - Grammars fixed.
 
@@ -23,14 +23,6 @@ PineScript is a domain-specific scripting language developed by TradingView. It
 
 ---
 
-### PineScript Color Themes
-PineScript Helper extension is best suited for use with [**PineScript Color Themes**](https://marketplace.visualstudio.com/items?itemName=salbert11.pinescript-color-themes).  
-**PineScript Color Themes** provides a collection of editor themes tailored for PineScript development, offering a visually pleasing environment for writing PineScript code.
-
-*Note: If you prefer a different theme, you are free to use any other themes of your choice. PineScript Helper is compatible with most themes.*
-
----
-
 ## Features 
 - **Syntax Highlighting** : The extension provides syntax highlighting for PineScript V5, making your code more readable and easier to navigate. 
 
@@ -50,6 +42,29 @@ PineScript Helper extension is best suited for use with [**PineScript Color Them
 
 ---
 
+- ***PineScript Color Themes** : The extension provides a collection of editor themes tailored for PineScript development, offering a visually pleasing environment for writing PineScript code.
+  - Pine Theme Original Dark
+  - Pine Theme Dark Pro
+  - Pine Theme Dark Pro Bold
+  - Pine Theme Monokai Dark
+  - Pine Theme Monokai Dark Bold
+  - Pine Theme Blue
+  - Pine Theme Blue Bold
+  - Pine Theme Dark Low Contrast
+  - Pine Theme Dark Low Contrast Bold
+  - Pine Theme Grey
+  - Pine Theme Grey Bold
+  - Pine Theme Grey Candy
+  - Pine Theme Light
+  - Pine Theme Light Bold
+
+*Note: If you prefer a different theme, you are free to use any other themes of your choice. PineScript Helper is compatible with most themes.*
+
+  ![](https://github.com/salbert11/pinethemes/raw/pinescript-color-themes/images/pine-themes.gif?raw=true)
+
+
+---
+
 ## Installation
 ### Method 1: Install from VS Code Command Palette
 
@@ -135,4 +150,4 @@ This extension is released under the [MIT License](./LICENSE.md).
 
 ---
 
-*Version 3.2.3*
+*Version 3.3.0*

images/pine-themes.gif

@@ -5,7 +5,7 @@
 	"icon": "images/pineicon.png",
 	"publisher": "salbert11",
 	"license": "MIT",
-	"version": "3.2.4-beta-8",
+	"version": "3.3.0-beta-1",
 	"engines": {
 		"vscode": "^1.62.0"
 	},
@@ -14,7 +14,8 @@
 	},
 	"categories": [
 		"Programming Languages",
-		"Snippets"
+		"Snippets",
+		"Themes"
 	],
 	"keywords": [
 		"pine",
@@ -119,6 +120,78 @@
 				"scopeName": "source.ps",
 				"path": "./syntaxes/ps.tmLanguage.json"
 			}
+		],
+		"themes": [
+			{
+				"label": "Pine Theme Original Dark",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-original-dark.json"
+			},
+			{
+				"label": "Pine Theme Dark Pro Bold",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-dark-pro-bold.json"
+			},
+			{
+				"label": "Pine Theme Dark Pro",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-dark-pro.json"
+			},
+			{
+				"label": "Pine Theme Monokai Dark Bold",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-monokai-dark-bold.json"
+			},
+			{
+				"label": "Pine Theme Monokai Dark",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-monokai-dark.json"
+			},
+			{
+				"label": "Pine Theme Blue Bold",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-blue-bold.json"
+			},
+			{
+				"label": "Pine Theme Blue",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-blue.json"
+			},
+			{
+				"label": "Pine Theme Dark Low Contrast Bold",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-editor-dark-bold.json"
+			},
+			{
+				"label": "Pine Theme Dark Low Contrast",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-editor-dark.json"
+			},
+			{
+				"label": "Pine Theme Light Bold",
+				"uiTheme": "vs",
+				"path": "./themes/pine-editor-light-bold.json"
+			},
+			{
+				"label": "Pine Theme Light",
+				"uiTheme": "vs",
+				"path": "./themes/pine-editor-light.json"
+			},
+			{
+				"label": "Pine Theme Grey Bold",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-grey-bold.json"
+			},
+			{
+				"label": "Pine Theme Grey Candy",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-grey-fun.json"
+			},
+			{
+				"label": "Pine Theme Grey",
+				"uiTheme": "vs-dark",
+				"path": "./themes/pine-grey.json"
+			}
 		]
 	},
 	"scripts": {

package-lock.json

@@ -45,7 +45,7 @@ function testComment(document: vscode.TextDocument, position: vscode.Position, h
 }
 
 function testString(document: vscode.TextDocument, position: vscode.Position, hoverLineText: string){
-	let testStringPattern = new RegExp("(?:[^\\s\\w\\)\\}\\.\\-\\~\\`]\\s*\".*?\"\\s*(?:[^\\s\\w\\(\\{\\-\\~\\`]|$))|(?:[^\\s\\w\\)\\}\\.\\-\\~\\`]\\s*\'.*?\'\\s*(?:[^\\s\\w\\(\\{\\-\\~\\`]|$))");
+	let testStringPattern = new RegExp("(?:(?:^|[^\\s\\w\\)\\}\\.\\-\\~\\`\\\\])\\s*\".*?\"\\s*(?:[^\\s\\w\\(\\{\\-\\~\\`\\\\]|$))|(?:(?:^|[^\\s\\w\\)\\}\\.\\-\\~\\`\\\\])\\s*'.*?'\\s*(?:[^\\s\\w\\(\\{\\-\\~\\`\\\\]|$))");
 		if (testStringPattern.test(hoverLineText)){
 			let hoverRange = document.getWordRangeAtPosition(position, testStringPattern);
 			if (hoverRange){