fix and improvements

vscode/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Notable changes to the `TSL` extension will be documented in this file.
 
+## [1.4.0]: 2025-6-17
+
+- 修复：`[weakref]typename: type;`时，变量和类型高亮失效
+- 调整关键字分类
+
 ## [1.3.0]: 2025-06-17
 
 - 支持关键字大小写不敏感

vscode/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tsl-devkit",
   "displayName": "TSL",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "TSL syntax highlighter support for VSCode.",
   "publisher": "csh",
   "homepage": "https://git.mytsl.cn/csh/tsl-devkit",

vscode/syntaxes/tsl.tmLanguage.json

@@ -189,7 +189,7 @@
     },
     "variable-declarations": {
       "name": "meta.variable.declaration.tsl",
-      "match": "^\\s*(\\w+)\\s*(:)(?!=)\\s*([^;?]*)(;)?",
+      "match": "(?<!\\?\\s*)(\\w+)\\s*(:)(?!=)\\s*([^;?]*)(;)?",
       "captures": {
         "1": {
           "name": "variable.other.declaration.tsl"
@@ -412,6 +412,10 @@
           "name": "storage.modifier.access.tsl",
           "match": "(?i)\\b(public|protected|private|published)\\b"
         },
+        {
+          "name": "keyword.other.property-accessor.tsl",
+          "match": "(?i)\\b(read|write)\\b"
+        },
         {
           "name": "keyword.other.constructor.tsl",
           "match": "(?i)\\b(create|destroy|operator)\\b"
@@ -438,7 +442,15 @@
         },
         {
           "name": "keyword.control.block.tsl",
-          "match": "(?i)\\b(begin|end|this|with|weakref|autoref|namespace)\\b"
+          "match": "(?i)\\b(begin|end|with)\\b"
+        },
+        {
+          "name": "storage.modifier.reference.tsl",
+          "match": "(?i)\\b(weakref|autoref)\\b"
+        },
+        {
+          "name": "keyword.other.namespace.tsl",
+          "match": "(?i)\\bnamespace\\b"
         },
         {
           "name": "keyword.control.exception.tsl",
@@ -460,10 +472,6 @@
           "name": "keyword.operator.set.tsl",
           "match": "(?i)\\b(union|minus|union2)\\b"
         },
-        {
-          "name": "keyword.operator.io.tsl",
-          "match": "(?i)\\b(write|read)\\b"
-        },
         {
           "name": "keyword.control.sql.tsl",
           "match": "(?i)\\b(select|vselect|sselect|update|delete|mselect)\\b"
@@ -486,16 +494,20 @@
         },
         {
           "name": "variable.language.builtin.tsl",
-          "match": "(?i)\\b(paramcount|realparamcount|params|system|thisfunction|tslassigning|likeeps|likeepsrate)\\b"
+          "match": "(?i)\\b(paramcount|realparamcount|params|system|tslassigning|likeeps|likeepsrate)\\b"
         },
         {
           "name": "support.function.builtin.tsl",
-          "match": "(?i)\\b(echo|mtic|mtoc|this|inf|nan)\\b"
+          "match": "(?i)\\b(echo|mtic|mtoc)\\b"
         },
         {
           "name": "constant.language.boolean.tsl",
           "match": "(?i)\\b(false|true)\\b"
         },
+        {
+          "name": "constant.language.math.tsl",
+          "match": "(?i)\\b(inf|nan)\\b"
+        },
         {
           "name": "constant.language.null.tsl",
           "match": "(?i)\\bnil\\b"