[css] custom data polishes

aeschli · aeschli · commit 3acea34ca51c · 2020-06-19T21:58:54.000+02:00
diff --git a/extensions/css-language-features/client/src/customData.ts b/extensions/css-language-features/client/src/customData.ts
@@ -76,17 +76,13 @@ function getCustomDataPathsInAllWorkspaces(): string[] {
 
 function getCustomDataPathsFromAllExtensions(): string[] {
 	const dataPaths: string[] = [];
-
 	for (const extension of extensions.all) {
-		const contributes = extension.packageJSON && extension.packageJSON.contributes;
-
-		if (contributes && contributes.css && contributes.css.customData && Array.isArray(contributes.css.customData)) {
-			const relativePaths: string[] = contributes.css.customData;
-			relativePaths.forEach(rp => {
+		const customData = extension.packageJSON?.contributes?.css?.customData;
+		if (Array.isArray(customData)) {
+			for (const rp of customData) {
 				dataPaths.push(joinPath(extension.extensionUri, rp).toString());
-			});
+			}
 		}
 	}
-
 	return dataPaths;
 }
diff --git a/extensions/css-language-features/server/src/customData.ts b/extensions/css-language-features/server/src/customData.ts
@@ -29,7 +29,7 @@ function parseCSSData(source: string): ICSSDataProvider {
 	}
 
 	return newCSSDataProvider({
-		version: 1,
+		version: rawData.version || 1,
 		properties: rawData.properties || [],
 		atDirectives: rawData.atDirectives || [],
 		pseudoClasses: rawData.pseudoClasses || [],

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function parseCSSData(source: string): ICSSDataProvider {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`return newCSSDataProvider({`
`32`		`- version: 1,`
	`32`	`+ version: rawData.version \|\| 1,`
`33`	`33`	`properties: rawData.properties \|\| [],`
`34`	`34`	`atDirectives: rawData.atDirectives \|\| [],`
`35`	`35`	`pseudoClasses: rawData.pseudoClasses \|\| [],`