Fix for semantic tokens highlight on only user specified files or def…

…aults
hyperjump-io · May 17, 2024 · c266452 · c266452
1 parent d55c3a0
commit c266452
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/language-server/src/features/document-settings.js b/language-server/src/features/document-settings.js
@@ -2,7 +2,6 @@ import { DidChangeConfigurationNotification } from "vscode-languageserver";
 import { publish } from "../pubsub.js";
 
 
-export const isSchema = RegExp.prototype.test.bind(/(?:\.|\/|^)schema\.json$/);
 export let schemaFilePatterns = ["**/*.schema.json", "**/schema.json"];
 
 let hasConfigurationCapability = false;

diff --git a/language-server/src/features/semantic-tokens.js b/language-server/src/features/semantic-tokens.js
@@ -3,7 +3,8 @@ import { getKeywordId } from "@hyperjump/json-schema/experimental";
 import * as Instance from "../json-instance.js";
 import { getSchemaDocument } from "./schema-documents.js";
 import { toAbsoluteUri } from "../util.js";
-import { isSchema } from "./document-settings.js";
+import { schemaFilePatterns } from "./document-settings.js";
+import { isMatchedFile } from "./workspace.js";
 
 
 export default {
@@ -51,7 +52,7 @@ export default {
     };
 
     connection.languages.semanticTokens.on(async ({ textDocument }) => {
-      if (!isSchema(textDocument.uri)) {
+      if (!isMatchedFile(textDocument.uri, schemaFilePatterns)) {
         return { data: [] };
       }
 

diff --git a/language-server/src/features/workspace.js b/language-server/src/features/workspace.js
@@ -15,7 +15,7 @@ import { getDocumentSettings } from "./document-settings.js";
 import picomatch from "picomatch";
 
 
-const isMatchedFile = (uri, patterns) => {
+export const isMatchedFile = (uri, patterns) => {
   const matchers = patterns.map((pattern) => {
     return picomatch(pattern, {
       noglobstar: false,