fix(css, html, json, yaml): failed to resolve relative path

volarjs · May 14, 2024 · ea87a14 · ea87a14
1 parent b4877d2
commit ea87a14
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/packages/css/index.ts b/packages/css/index.ts
@@ -16,6 +16,10 @@ export function create({
 	getDocumentContext = context => {
 		return {
 			resolveReference(ref, base) {
+				const decoded = context.decodeEmbeddedDocumentUri(base);
+				if (decoded) {
+					base = decoded[0];
+				}
 				if (ref.match(/^\w[\w\d+.-]*:/)) {
 					// starts with a schema
 					return ref;

diff --git a/packages/html/index.ts b/packages/html/index.ts
@@ -16,6 +16,10 @@ export function create({
 	getDocumentContext = context => {
 		return {
 			resolveReference(ref, base) {
+				const decoded = context.decodeEmbeddedDocumentUri(base);
+				if (decoded) {
+					base = decoded[0];
+				}
 				if (ref.match(/^\w[\w\d+.-]*:/)) {
 					// starts with a schema
 					return ref;
@@ -111,7 +115,7 @@ export function create({
 			const fileSystemProvider: html.FileSystemProvider = {
 				stat: async uri => await context.env.fs?.stat(uri)
 					?? { type: html.FileType.Unknown, ctime: 0, mtime: 0, size: 0 },
-				readDirectory: async uri => context.env.fs?.readDirectory(uri) ?? [],
+				readDirectory: async uri => await context.env.fs?.readDirectory(uri) ?? [],
 			};
 			const documentContext = getDocumentContext(context);
 			const htmlLs = html.getLanguageService({

diff --git a/packages/json/index.ts b/packages/json/index.ts
@@ -17,9 +17,13 @@ export interface JSONSchemaSettings {
 
 export function create({
 	documentSelector = ['json', 'jsonc'],
-	getWorkspaceContextService = () => {
+	getWorkspaceContextService = context => {
 		return {
 			resolveRelativePath(relativePath, resource) {
+				const decoded = context.decodeEmbeddedDocumentUri(resource);
+				if (decoded) {
+					resource = decoded[0];
+				}
 				const base = resource.substring(0, resource.lastIndexOf('/') + 1);
 				return Utils.resolvePath(URI.parse(base), relativePath).toString();
 			},

diff --git a/packages/yaml/index.ts b/packages/yaml/index.ts
@@ -14,9 +14,13 @@ function noop(): undefined { }
  */
 export function create({
 	documentSelector = ['yaml'],
-	getWorkspaceContextService = () => {
+	getWorkspaceContextService = context => {
 		return {
 			resolveRelativePath(relativePath, resource) {
+				const decoded = context.decodeEmbeddedDocumentUri(resource);
+				if (decoded) {
+					resource = decoded[0];
+				}
 				const base = resource.substring(0, resource.lastIndexOf('/') + 1);
 				return Utils.resolvePath(URI.parse(base), relativePath).toString();
 			},