update 2.1.1

CHANGELOG.md

@@ -8,6 +8,11 @@
 
 ---
 
+### 2.2.1
+- Better support for embeded string code like in Php or Typescript
+- Better Typescript support
+- Little change in Rust
+
 ### 2.2.0
 - Better Zig support
 

README.md

@@ -14,12 +14,12 @@
     </a>
 </div>
 
-<!-- > 🗒️ -->
-> [!NOTE]
+<!-- > [!NOTE] -->
+> 🗒️
 > Yellowed is a simple material dark theme wich focus his syntax color on the golden yellow. Its syntax is inspired by the [gruber-darker](https://github.com/rexim/gruber-darker-theme) theme for emacs, but changed a bit.
 
-<!-- > ❗ -->
-> [!IMPORTANT]
+<!-- > [!IMPORTANT] -->
+> ❗
 > If you find any weird syntax highlighting, try disabling semantic highlighting. If it doesn't work then please report it [here](https://github.com/Gael-Lopes-Da-Silva/YellowedVSCode/issues/new/choose). This would help me a lot since I can't cover all the languages.
 
 ## 🖼️ Screenshots
@@ -49,6 +49,6 @@ Yellow     - [#ffd900]
 White      - [#ffffff]
 ~~~
 
-<!-- > 🗒️ -->
-> [!NOTE]
+<!-- > [!NOTE] -->
+> 🗒️
 > You can find my Visual Studio Code configuraton [here](https://github.com/Gael-Lopes-Da-Silva/MyVscodeConfig).

TODO.md

@@ -5,6 +5,7 @@
 - [x] add "keyword.other.type.php" to yellow color
 - [x] add "support.constant.core.php" to purple bold color
 - [x] try to find something like "support.function" or "support.function.php"
+- [x] add "meta.embedded.block.php" to white color
 
 # Xml
 - [x] add "entity.other.attribute-name.xml" to light gray color

package.json

@@ -1,21 +1,19 @@
 {
     "name": "yellowed",
-    "version": "2.2.0",
     "displayName": "Yellowed",
+    "version": "2.2.1",
     "description": "A lemon like theme for vscode.",
     "publisher": "gael-lopes-da-silva",
     "icon": "resources/icon.png",
     "license": "LICENSE.md",
+    "homepage": "https://raw.githubusercontent.com/Gael-Lopes-Da-Silva/YellowedVSCode/main/README.md",
     "markdown": "github",
     "engines": {
         "vscode": "^1.81.1"
     },
     "categories": [
         "Themes"
     ],
-    "maintainers": [
-        "Gael Lopes Da Silva"
-    ],
     "scripts": {
         "publish": "vsce publish",
         "package": "vsce package -o build"
@@ -42,9 +40,7 @@
         "color": "#ffd900",
         "theme": "dark"
     },
-    "homepage": "https://github.com/Gael-Lopes-Da-Silva/YellowedVSCode",
     "keywords": [
-        "amogus",
         "yellowed",
         "yellow",
         "dark",

samples/.env

@@ -48,10 +48,10 @@ TEST_NUM_HEX=0x1A
 # TEST_THREE="foobar" # A comment on a commented row.
 TEST_FOUR="test test test" # this is a comment.
 TEST_FIVE="comment symbol # inside string" # this is a comment.
-TEST_SIX="comment symbol # and quotes \" \' inside quotes" # " this is a comment.
+TEST_SIX="comment symbol # and quotes inside quotes" # " this is a comment.
 
 # Escape sequences.
-TEST_ESCAPE="escaped characters \n \t \r \" \' \$ or maybe a backslash \\..."
+TEST_ESCAPE="escaped characters \n \t \r \$ or maybe a backslash \\..."
 
 # Double Quotes.
 TEST_DOUBLE="Lorem {$VAR1} ${VAR2} $VAR3 ipsum dolor sit amet\n\r\t\\"

samples/.php

@@ -1,3 +1,93 @@
+<div class="test<?php
+/**
+ * Small Class.
+ *
+ * @since 1.0.0
+ */
+class Small
+{
+	/**
+	 * Name.
+	 *
+	 * @var String
+	 * @since 1.0.0
+	 */
+	public static $name;
+
+	/**
+	 * Sum.
+	 *
+	 * @param Number $num1 First number.
+	 * @param Number $num2 First number.
+	 * @return Number
+	 * @since 1.0.0
+	 */
+	public static function sum($num1, $num2)
+	{
+		return $num1 + $num2;
+	}
+}
+
+// SQL for the win.
+$get = "SELECT *
+			FROM blog
+			WHERE country='$country'
+			AND who='host'
+			ORDER BY date DESC";
+
+namespace Hyunk3l\PhpDesignPatterns\Creational\Builder;
+
+use Hyunk3l\PhpDesignPatterns\Creational\Builder\Components\Box;
+use Hyunk3l\PhpDesignPatterns\Creational\Builder\Components\Band;
+use Hyunk3l\PhpDesignPatterns\Creational\Builder\Components\Movement;
+use Hyunk3l\PhpDesignPatterns\Creational\Builder\Components\Hand;
+
+class ClassicWatchBuilder implements WatchBuilderInterface
+{
+	private Watch $watch;
+
+	public function createWatch(): WatchBuilderInterface
+	{
+		$this->watch = new ClassicWatch();
+		return $this;
+	}
+
+	public function addBox(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Watch box", new Box());
+		return $this;
+	}
+
+	public function addHands(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Seconds hand", new Hand());
+		$this->watch->addComponent("Minutes hand", new Hand());
+		$this->watch->addComponent("Hours hand", new Hand());
+		return $this;
+	}
+
+	public function addBands(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Leather upper band", new Band());
+		$this->watch->addComponent("Leather lower band", new Band());
+		return $this;
+	}
+
+	public function addMovements(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Principal watch movement", new Movement());
+		$this->watch->addComponent("Date watch movement", new Movement());
+		return $this;
+	}
+
+	public function getWatch(): Watch
+	{
+		return $this->watch;
+	}
+}
+
+?>"></div>
+
 <?php // phpcs:ignore
 /**
  * PHP is fun
@@ -19,10 +109,10 @@
 $awais = 'Awais';
 
 // Display the page to admins and subscribers only.
-if ( current_user_can( 'administrator' ) || current_user_can( 'subscriber' ) ) {
+if (current_user_can('administrator') || current_user_can('subscriber')) {
 	echo 'HELLO!';
 } else {
-	wp_safe_redirect( 'https://VSCode.pro', 302 );
+	wp_safe_redirect('https://VSCode.pro', 302);
 	exit;
 }
 
@@ -34,7 +124,8 @@
  *
  * @since 1.0.0
  */
-class Small {
+class Small
+{
 	/**
 	 * Name.
 	 *
@@ -51,7 +142,8 @@ class Small {
 	 * @return Number
 	 * @since 1.0.0
 	 */
-	public static function sum( $num1, $num2 ) {
+	public static function sum($num1, $num2)
+	{
 		return $num1 + $num2;
 	}
 }
@@ -72,44 +164,44 @@ public static function sum( $num1, $num2 ) {
 
 class ClassicWatchBuilder implements WatchBuilderInterface
 {
-    private Watch $watch;
-
-    public function createWatch(): WatchBuilderInterface
-    {
-        $this->watch = new ClassicWatch();
-        return $this;
-    }
-
-    public function addBox(): WatchBuilderInterface
-    {
-        $this->watch->addComponent("Watch box", new Box());
-        return $this;
-    }
-
-    public function addHands(): WatchBuilderInterface
-    {
-        $this->watch->addComponent("Seconds hand", new Hand());
-        $this->watch->addComponent("Minutes hand", new Hand());
-        $this->watch->addComponent("Hours hand", new Hand());
-        return $this;
-    }
-
-    public function addBands(): WatchBuilderInterface
-    {
-        $this->watch->addComponent("Leather upper band", new Band());
-        $this->watch->addComponent("Leather lower band", new Band());
-        return $this;
-    }
-
-    public function addMovements(): WatchBuilderInterface
-    {
-        $this->watch->addComponent("Principal watch movement", new Movement());
-        $this->watch->addComponent("Date watch movement", new Movement());
-        return $this;
-    }
-
-    public function getWatch(): Watch
-    {
-        return $this->watch;
-    }
+	private Watch $watch;
+
+	public function createWatch(): WatchBuilderInterface
+	{
+		$this->watch = new ClassicWatch();
+		return $this;
+	}
+
+	public function addBox(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Watch box", new Box());
+		return $this;
+	}
+
+	public function addHands(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Seconds hand", new Hand());
+		$this->watch->addComponent("Minutes hand", new Hand());
+		$this->watch->addComponent("Hours hand", new Hand());
+		return $this;
+	}
+
+	public function addBands(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Leather upper band", new Band());
+		$this->watch->addComponent("Leather lower band", new Band());
+		return $this;
+	}
+
+	public function addMovements(): WatchBuilderInterface
+	{
+		$this->watch->addComponent("Principal watch movement", new Movement());
+		$this->watch->addComponent("Date watch movement", new Movement());
+		return $this;
+	}
+
+	public function getWatch(): Watch
+	{
+		return $this->watch;
+	}
 }

samples/.ts

@@ -68,6 +68,22 @@ export function activate(context: vscode.ExtensionContext) {
 })(angular);
 
 
+let age: number = 25;
+let name: string = "John";
+let isStudent: boolean = false;
+let scores: number[] = [98, 76, 89];
+let person: { name: string, age: number } = { name: "John", age: 25 };
+
+// Properly annotating function parameter and return types
+function greet(name: string): string {
+  return "Hello, " + name;
+}
+
+function add(a: number, b: number): number {
+  return a + b;
+}
+
+
 const options = {
 	method: 'GET',
 	uri: 'https://api.github.com/com/search/repositores',