Support Embed and ResourceParam

pj8 · May 17, 2024 · d6a2ff2 · d6a2ff2
1 parent d32b74c
commit d6a2ff2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/PeekFileDefinitionProvider.ts b/src/PeekFileDefinitionProvider.ts
@@ -5,7 +5,7 @@ export default class PeekFileDefinitionProvider implements vscode.DefinitionProv
   resourceAppPaths: string[] = [];
   resourcePagePaths: string[] = [];
 
-  public static readonly regexPattern = /(get|post|put|delete|resource|uri)\(['"](app|page):\/\/self\/(.*)['"]/;
+  public static readonly regexPattern = /(get|post|put|delete|resource|uri|ResourceParam|Embed)\(.*?(app|page):\/\/self\/(.*)['"]/;
 
   constructor(targetFileExtensions: string[] = [], resourceAppPaths: string[] = [], resourcePagePaths: string[] = []) {
     this.targetFileExtensions = targetFileExtensions;

diff --git a/src/test/regexTest.js b/src/test/regexTest.js
@@ -1,5 +1,5 @@
 // @see PeekFileDefinitionProvider.regexPattern
-const regexPattern = /(get|post|put|delete|resource|uri)\(['"](app|page):\/\/self\/(.*)['"]/;
+const regexPattern = /(get|post|put|delete|resource|uri|ResourceParam|Embed)\(.*?(app|page):\/\/self\/(.*)['"]/;
 
 function testRegexTrue(target) {
 	// Test
@@ -34,6 +34,9 @@ testRegexTrue("put('app://self/foo')");
 testRegexTrue("delete('app://self/foo')");
 testRegexTrue('resource("app://self/foo")');
 testRegexTrue('uri("app://self/foo")');
+testRegexTrue("#[ResourceParam(uri: 'app://self/user#ulid', param: 'userId')]");
+testRegexTrue("#[Embed(rel: 'foo', src: 'app://self/foo{?ulid}')]");
 
 testRegexFalse('resource("foo://self/foo")');
 testRegexFalse('foo("app://self/foo")');
+testRegexFalse('getFoo("app://self/foo")');