feat: highlight the identifier after the tag as well

Safe-DS · Oct 24, 2023 · 963daeb · 963daeb
1 parent f95866f
commit 963daeb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/src/language/lsp/safe-ds-semantic-token-provider.ts b/src/language/lsp/safe-ds-semantic-token-provider.ts
@@ -24,6 +24,7 @@ import {
     isSdsPipeline,
     isSdsPlaceholder,
     isSdsReference,
+    isSdsResult,
     isSdsSchema,
     isSdsSegment,
     isSdsTypeArgument,
@@ -207,6 +208,12 @@ export class SafeDsSemanticTokenProvider extends AbstractSemanticTokenProvider {
                 type: SemanticTokenTypes.variable,
                 modifier: [SemanticTokenModifiers.readonly, ...additionalModifiers],
             };
+        } else if (isSdsResult(node)) {
+            return {
+                // For lack of a better option, we use the token type for parameters here
+                type: SemanticTokenTypes.parameter,
+                modifier: additionalModifiers,
+            };
         } else if (isSdsSchema(node)) {
             return {
                 type: SemanticTokenTypes.type,

diff --git a/syntaxes/safe-ds.tmLanguage.json b/syntaxes/safe-ds.tmLanguage.json
@@ -74,8 +74,30 @@
                     "end": "\\*/",
                     "patterns": [
                         {
-                            "name": "keyword.other.safe-ds",
-                            "match": "(@param|@result|@since|@typeParam)\\b"
+                            "match": "(@param|@result)\\s+([_a-zA-Z][_a-zA-Z0-9]*)?",
+                            "captures": {
+                                "1": {
+                                    "name": "keyword.other.safe-ds"
+                                },
+                                "2": {
+                                    "name": "variable.parameter.safe-ds"
+                                }
+                            }
+                        },
+                        {
+                            "match": "(@since)\\b",
+                            "name": "keyword.other.safe-ds"
+                        },
+                        {
+                            "match": "(@typeParam)\\s+([_a-zA-Z][_a-zA-Z0-9]*)?",
+                            "captures": {
+                                "1": {
+                                    "name": "keyword.other.safe-ds"
+                                },
+                                "2": {
+                                    "name": "entity.name.type.parameter"
+                                }
+                            }
                         }
                     ]
                 },

diff --git a/tests/language/lsp/safe-ds-semantic-token-provider.test.ts b/tests/language/lsp/safe-ds-semantic-token-provider.test.ts
@@ -100,6 +100,11 @@ describe('SafeDsSemanticTokenProvider', async () => {
             `,
             expectedTokenTypes: [SemanticTokenTypes.variable],
         },
+        {
+            testName: 'result declaration',
+            code: 'fun f() -> (<|r|>: String)',
+            expectedTokenTypes: [SemanticTokenTypes.parameter],
+        },
         {
             testName: 'schema declaration',
             code: 'schema <|S|>() {}',