From d6a2ff23b737ad869493179484203af057a0dd7b Mon Sep 17 00:00:00 2001 From: Yuki Adachi Date: Sat, 18 May 2024 00:21:49 +0700 Subject: [PATCH 1/2] Support Embed and ResourceParam --- src/PeekFileDefinitionProvider.ts | 2 +- src/test/regexTest.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/PeekFileDefinitionProvider.ts b/src/PeekFileDefinitionProvider.ts index 63ba73b..cc771ff 100644 --- 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 index d5fb95f..275254e 100644 --- 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")'); From 01571d0063170607402ce7bf60b57faad45f66f1 Mon Sep 17 00:00:00 2001 From: Yuki Adachi Date: Sat, 18 May 2024 00:40:15 +0700 Subject: [PATCH 2/2] Add license --- LICENSE | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..684bcd6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,15 @@ +############################################################################ +# Copyright 2024 Yuki Adachi https://github.com/yuki777 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +############################################################################