Merge branch 'main' into sandy081/profilesStorageServicesandy081/profilesStorageService

1 files changed, 4 insertions, 3 deletions

diff --git a/extensions/html-language-features/server/src/utils/documentContext.ts b/extensions/html-language-features/server/src/utils/documentContext.ts
index 88e3f032885..9cf8ce9ea76 100644
--- a/extensions/html-language-features/server/src/utils/documentContext.ts
+++ b/extensions/html-language-features/server/src/utils/documentContext.ts
@@ -6,7 +6,7 @@
 import { DocumentContext } from 'vscode-css-languageservice';
 import { endsWith, startsWith } from '../utils/strings';
 import { WorkspaceFolder } from 'vscode-languageserver';
-import { resolvePath } from '../requests';
+import { URI, Utils } from 'vscode-uri';
 
 export function getDocumentContext(documentUri: string, workspaceFolders: WorkspaceFolder[]): DocumentContext {
 	function getRootFolder(): string | undefined {
@@ -34,8 +34,9 @@ export function getDocumentContext(documentUri: string, workspaceFolders: Worksp
 					return folderUri + ref.substr(1);
 				}
 			}
-			base = base.substr(0, base.lastIndexOf('/') + 1);
-			return resolvePath(base, ref);
+			const baseUri = URI.parse(base);
+			const baseUriDir = baseUri.path.endsWith('/') ? baseUri : Utils.dirname(baseUri);
+			return Utils.resolvePath(baseUriDir, ref).toString(true);
 		},
 	};
 }