fix(): settings type simplified to one level

fix(): folder reference now '/' from '/*'
microsoft · Nov 1, 2023 · 896f755 · 896f755
1 parent 5915e94
commit 896f755
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/src/cssLanguageService.ts b/src/cssLanguageService.ts
@@ -80,7 +80,7 @@ function createFacade(parser: Parser, completion: CSSCompletion, hover: CSSHover
 			validation.configure(settings);
 			completion.configure(settings?.completion);
 			hover.configure(settings?.hover);
-			navigation.configure(settings?.alias);
+			navigation.configure(settings?.importAliases);
 		},
 		setDataProviders: cssDataManager.setDataProviders.bind(cssDataManager),
 		doValidation: validation.doValidation.bind(validation),

diff --git a/src/cssLanguageTypes.ts b/src/cssLanguageTypes.ts
@@ -47,11 +47,11 @@ export interface LanguageSettings {
 	lint?: LintSettings;
 	completion?: CompletionSettings;
 	hover?: HoverSettings;
-	alias?: AliasSettings;
+	importAliases?: AliasSettings;
 }
 
 export interface AliasSettings {
-	paths?: { [key: string]: string };
+	[key: string]: string;
 }
 
 export interface HoverSettings {

diff --git a/src/services/cssNavigation.ts b/src/services/cssNavigation.ts
@@ -412,16 +412,16 @@ export class CSSNavigation {
 		// Try resolving the reference from the language configuration alias settings
 		if (ref && !(await this.fileExists(ref))) {
 			const rootFolderUri = documentContext.resolveReference('/', documentUri);
-			if (settings?.paths && rootFolderUri) {
+			if (settings && rootFolderUri) {
 				// Specific file reference
-				if (target in settings.paths) {
-					return this.mapReference(joinPath(rootFolderUri, settings.paths[target]), isRawLink);
+				if (target in settings) {
+					return this.mapReference(joinPath(rootFolderUri, settings[target]), isRawLink);
 				}
 				// Reference folder
 				const firstSlash = target.indexOf('/');
-				const prefix = `${target.substring(0, firstSlash)}/*`;
-				if (prefix in settings.paths) {
-					const aliasPath = (settings.paths[prefix]).slice(0, -1);
+				const prefix = `${target.substring(0, firstSlash)}/`;
+				if (prefix in settings) {
+					const aliasPath = (settings[prefix]).slice(0, -1);
 					let newPath = joinPath(rootFolderUri, aliasPath);
 					return this.mapReference(newPath = joinPath(newPath, target.substring(prefix.length - 1)), isRawLink);
 				}

diff --git a/src/test/css/navigation.test.ts b/src/test/css/navigation.test.ts
@@ -186,11 +186,9 @@ function getCSSLS() {
 
 function aliasSettings(): LanguageSettings {
 	return {
-		"alias": {
-			"paths": {
+		"importAliases": {
 				"@SingleStylesheet": "/src/assets/styles.css",
-				"@AssetsDir/*": "/src/assets/*",
-			}
+				"@AssetsDir/": "/src/assets/",
 		}
 	};
 }

diff --git a/src/test/scss/scssNavigation.test.ts b/src/test/scss/scssNavigation.test.ts
@@ -19,14 +19,12 @@ function getSCSSLS() {
 
 function aliasSettings(): LanguageSettings {
 	return {
-		"alias": {
-			"paths": {
+		"importAliases": {
 				"@SassStylesheet": "/src/assets/styles.scss",
-				"@NoUnderscoreDir/*": "/noUnderscore/*",
-				"@UnderscoreDir/*": "/underscore/*",
-				"@BothDir/*": "/both/*",
+				"@NoUnderscoreDir/": "/noUnderscore/",
+				"@UnderscoreDir/": "/underscore/",
+				"@BothDir/": "/both/",
 			}
-		}
 	};
 }