Several fixes/improvements.

Author: BonnyAD9

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v1.1.27
+- Fix `var` keyword and types in some special contexts in C# razor.
+- Fix TypeScript template expressions.
+- Fix some keywords in PHP (`namespace`, `use`, `new` and possibly others).
+- Use special highlighting for functions like echo in PHP.
+
 ## v1.1.26
 - Fix latex keywords, operators and character constants.
 - Fix rust bool literals.

README.md

@@ -10,6 +10,7 @@ Contains several color variants:
 - Yellow
 - Cyan
 - Magenta
+- Kumuhana
 
 ## How it looks
 The yellow version (My favourite)

package.json

@@ -2,7 +2,7 @@
     "name": "typedark",
     "displayName": "TypeDark",
     "description": "Dark theme with useful semantic highlighting.",
-    "version": "1.1.26",
+    "version": "1.1.27",
     "icon": "images/icon.png",
     "repository": {
         "url": "https://github.com/BonnyAD9/TypeDark"

test-files/main.js

@@ -1,4 +1,6 @@
 import "";
+import DatePicker from "react-date-picker";
+import 'react-date-picker/dist/DatePicker.css'
 
 class FSItem {
     /** @type {Path} */
@@ -62,3 +64,48 @@ function createFile(dir, name) {
     };
     return dir.value[name];
 }
+
+function DateInput(props) {
+    const onChange = (e) => {
+        // one way of handling the input change, set new value to the data the
+        // caller has passed
+        if (props.data) {
+            props.data.setData({
+                ...props.data.data,
+                [props.name]: e,
+            });
+        }
+
+        // second way of handling the input change: event
+        if (props.onChange) {
+            props.onChange({ target: { value: e, name: props.name } });
+        }
+    };
+
+    const onBlur = (e) => {
+        // one way of handling the input save, set new value to the data the
+        // caller has passed
+        if (props.save) {
+            props.save(props.data.data);
+        }
+
+        // second way of handling the input save: event
+        if (props.onBlur) {
+            if (!e.target.parentElement.parentElement.matches(":focus-within"))
+            {
+                props.onBlur({target: { name: props.name }});
+            }
+        }
+    };
+
+    return <DatePicker
+        calendarIcon={null}
+        clearIcon={null}
+        disableCalendar
+        className="date-picker"
+        format={props.format ? props.format : "dd.MM.yyyy"}
+        onChange={onChange}
+        onBlur={onBlur}
+        value={props.data ? props.data.data[props.name] : props.value}
+    />
+}

test-files/main.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace App;
+use App;
+
 $rules = [];
 
 while (true) {
@@ -93,3 +96,11 @@ function swap(mixed &$a, mixed &$b) {
     $a = $b;
     $b = $h;
 }
+
+class SomeClass {
+    public function __construct() {
+        echo "lol";
+    }
+}
+
+$lol = new SomeClass();

test-files/main.razor

@@ -14,3 +14,49 @@
         count++;
     }
 }
+
+@page "/roles"
+@using System.Security.Claims
+@inject AuthenticationStateProvider AuthenticationStateProvider
+
+<h1>ClaimsPrincipal Data</h1>
+
+<button @onclick="GetClaimsPrincipalData">Get ClaimsPrincipal Data</button>
+
+<p>@authMessage</p>
+
+@if (claims.Any())
+{
+    <ul>
+        @foreach (var claim in claims)
+        {
+            <li>@claim.Type: @claim.Value</li>
+        }
+    </ul>
+}
+
+<p>@surname</p>
+
+@code {
+    private string? authMessage;
+    private string? surname;
+    private IEnumerable<Claim> claims = Enumerable.Empty<Claim>();
+
+    private async Task GetClaimsPrincipalData()
+    {
+        var authState = await AuthenticationStateProvider
+            .GetAuthenticationStateAsync();
+        var user = authState.User;
+
+        if (user.Identity is not null && user.Identity.IsAuthenticated)
+        {
+            authMessage = $"{user.Identity.Name} is authenticated.";
+            claims = user.Claims;
+            surname = user.FindFirst(c => c.Type == ClaimTypes.Surname)?.Value;
+        }
+        else
+        {
+            authMessage = "The user is NOT authenticated.";
+        }
+    }
+}

test-files/main.ts

@@ -95,3 +95,19 @@ function svgPreviewHTML(file: vscode.TextDocument) {
 function HTML(content: string, head?: string) {
     return `...`;
 }
+
+export function useEvents(filters: any) {
+    let filtersStr = '';
+    if (filters) {
+        if (filters.get('datum') === 'vse') {
+            filtersStr += 'date=all'
+        } else if (filters.get('datum') === 'probehle') {
+            filtersStr += 'date=past';
+        } else {
+            filtersStr += 'date=upcoming';
+        }
+        if (filters.has('misto')) {
+            filtersStr += `&place=${filters.get('misto')}`;
+        }
+    }
+}

themes/TypeDark-cyan-color-theme.json

@@ -283,6 +283,7 @@
                 "source.c keyword.other",
                 "source.shell keyword.control",
                 "source.php keyword.control",
+                "source.php keyword.other",
                 "source.oraclesql keyword.control",
                 "source.zig keyword.control",
                 "source.js keyword.control",
@@ -318,6 +319,7 @@
                 "keyword.language",
                 "source.rust variable.language",
                 "entity.name.function.macro.rules.rust",
+                "keyword.other.var.cs",
             ],
             "settings": {
                 "foreground": "#4c8dff",
@@ -463,6 +465,7 @@
                 "entity.name.command.shell",
                 "meta.class support.function.constructor",
                 "entity.other.inherited-class.php",
+                "text.aspnetcorerazor entity.name.type.cs",
             ],
             "settings": {
                 "foreground": "#28c3cc"
@@ -511,6 +514,7 @@
             "scope": [
                 "meta.interpolation",
                 "meta.template.expression.js",
+                "meta.template.expression.ts",
                 "variable.parameter.label.asm",
                 "support.class.math.block",
                 "entity.name.type.namespace punctuation.separator.inheritance",
@@ -695,6 +699,7 @@
                 "variable.source.cmake",
                 "variable.language.nawk",
                 "variable.language.awk",
+                "source.php support.function.construct",
             ],
             "settings": {
                 "foreground": "#e2ccff",

themes/TypeDark-kumuhana-color-theme.json

@@ -249,6 +249,7 @@
                 "source.c keyword.other",
                 "source.shell keyword.control",
                 "source.php keyword.control",
+                "source.php keyword.other",
                 "source.oraclesql keyword.control",
                 "source.zig keyword.control",
                 "source.js keyword.control",
@@ -284,6 +285,7 @@
                 "keyword.language",
                 "source.rust variable.language",
                 "entity.name.function.macro.rules.rust",
+                "keyword.other.var.cs",
             ],
             "settings": {
                 "foreground": "#4c8dff",
@@ -429,6 +431,7 @@
                 "entity.name.command.shell",
                 "meta.class support.function.constructor",
                 "entity.other.inherited-class.php",
+                "text.aspnetcorerazor entity.name.type.cs",
             ],
             "settings": {
                 "foreground": "#28c3cc"
@@ -477,6 +480,7 @@
             "scope": [
                 "meta.interpolation",
                 "meta.template.expression.js",
+                "meta.template.expression.ts",
                 "variable.parameter.label.asm",
                 "support.class.math.block",
                 "entity.name.type.namespace punctuation.separator.inheritance",
@@ -661,6 +665,7 @@
                 "variable.source.cmake",
                 "variable.language.nawk",
                 "variable.language.awk",
+                "source.php support.function.construct",
             ],
             "settings": {
                 "foreground": "#e2ccff",

themes/TypeDark-magenta-color-theme.json

@@ -291,6 +291,7 @@
                 "source.c keyword.other",
                 "source.shell keyword.control",
                 "source.php keyword.control",
+                "source.php keyword.other",
                 "source.oraclesql keyword.control",
                 "source.zig keyword.control",
                 "source.js keyword.control",
@@ -326,6 +327,7 @@
                 "keyword.language",
                 "source.rust variable.language",
                 "entity.name.function.macro.rules.rust",
+                "keyword.other.var.cs",
             ],
             "settings": {
                 "foreground": "#4c8dff",
@@ -471,6 +473,7 @@
                 "entity.name.command.shell",
                 "meta.class support.function.constructor",
                 "entity.other.inherited-class.php",
+                "text.aspnetcorerazor entity.name.type.cs",
             ],
             "settings": {
                 "foreground": "#28c3cc"
@@ -519,6 +522,7 @@
             "scope": [
                 "meta.interpolation",
                 "meta.template.expression.js",
+                "meta.template.expression.ts",
                 "variable.parameter.label.asm",
                 "support.class.math.block",
                 "entity.name.type.namespace punctuation.separator.inheritance",
@@ -703,6 +707,7 @@
                 "variable.source.cmake",
                 "variable.language.nawk",
                 "variable.language.awk",
+                "source.php support.function.construct",
             ],
             "settings": {
                 "foreground": "#e2ccff",

themes/TypeDark-yellow-color-theme.json

@@ -283,6 +283,7 @@
                 "source.c keyword.other",
                 "source.shell keyword.control",
                 "source.php keyword.control",
+                "source.php keyword.other",
                 "source.oraclesql keyword.control",
                 "source.zig keyword.control",
                 "source.js keyword.control",
@@ -318,6 +319,7 @@
                 "keyword.language",
                 "source.rust variable.language",
                 "entity.name.function.macro.rules.rust",
+                "keyword.other.var.cs",
             ],
             "settings": {
                 "foreground": "#4c8dff",
@@ -463,6 +465,7 @@
                 "entity.name.command.shell",
                 "meta.class support.function.constructor",
                 "entity.other.inherited-class.php",
+                "text.aspnetcorerazor entity.name.type.cs",
             ],
             "settings": {
                 "foreground": "#28c3cc"
@@ -511,6 +514,7 @@
             "scope": [
                 "meta.interpolation",
                 "meta.template.expression.js",
+                "meta.template.expression.ts",
                 "variable.parameter.label.asm",
                 "support.class.math.block",
                 "entity.name.type.namespace punctuation.separator.inheritance",
@@ -695,6 +699,7 @@
                 "variable.source.cmake",
                 "variable.language.nawk",
                 "variable.language.awk",
+                "source.php support.function.construct",
             ],
             "settings": {
                 "foreground": "#e2ccff",