Remove uriPatterns from JSON providers

Shopify · Jan 22, 2025 · d5c123a · d5c123a
1 parent cc43bc3
commit d5c123a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...nguage-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.ts b/...nguage-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.ts
@@ -33,8 +33,6 @@ import { GetTranslationsForURI, renderTranslation, translationValue } from '../.
  * {% endschema %}
  */
 export class SettingsPropertyCompletionProvider implements JSONCompletionProvider {
-  private uriPatterns = [/^.*\/(sections|blocks)\/[^\/]*\.liquid$/];
-
   constructor(public getDefaultSchemaTranslations: GetTranslationsForURI) {}
 
   async completeProperty(context: RequestContext, path: JSONPath): Promise<JSONCompletionItem[]> {

diff --git a/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.ts b/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.ts
@@ -2,19 +2,17 @@ import { isError } from '@shopify/theme-check-common';
 import { JSONPath, MarkedString } from 'vscode-json-languageservice';
 import { GetTranslationsForURI, renderTranslation, translationValue } from '../../../translations';
 import { isLiquidRequestContext, LiquidRequestContext, RequestContext } from '../../RequestContext';
-import { fileMatch } from '../../utils';
+import { isSectionOrBlockFile } from '../../utils';
 import { JSONHoverProvider } from '../JSONHoverProvider';
 import { AugmentedLiquidSourceCode } from '../../../documents';
 import { isSectionOrBlockSchema } from '../../completions/providers/BlockTypeCompletionProvider';
 
 export class SettingsHoverProvider implements JSONHoverProvider {
-  private uriPatterns = [/(sections|blocks)\/[^\/]*\.liquid$/];
-
   constructor(private getDefaultSchemaTranslations: GetTranslationsForURI) {}
 
   canHover(context: RequestContext, path: JSONPath): context is LiquidRequestContext {
     return (
-      fileMatch(context.doc.uri, this.uriPatterns) &&
+      isSectionOrBlockFile(context.doc.uri) &&
       isLiquidRequestContext(context) &&
       path.length !== 0 &&
       (isPresetSettingsPath(path) || isDefaultSettingsPath(path))