Merge pull request #137 from mrmlnc/ISSUE-131_apple_m1

ISSUE-131: fix Apple Silicon support
mrmlnc · Apr 17, 2021 · d238515 · d238515
2 parents 593d65f + 40770a7
commit d238515
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -115,7 +115,7 @@
 	"dependencies": {
 		"color": "3.1.2",
 		"color-name": "1.1.4",
-		"fast-glob": "3.2.2",
+		"fast-glob": "3.2.5",
 		"scss-symbols-parser": "2.0.1",
 		"vscode-css-languageservice": "4.1.1",
 		"vscode-languageclient": "6.1.3",

diff --git a/src/test/e2e/suite/hover/helper.ts b/src/test/e2e/suite/hover/helper.ts
@@ -17,11 +17,14 @@ export async function testHover(docUri: vscode.Uri, position: vscode.Position, e
 		throw Error('Hover failed');
 	}
 
-	const contents = result[0].contents;
-	contents.forEach((c, i) => {
-		const val = (c as any).value;
-		assert.equal(val, expectedHover.contents[i]);
-	});
+	const contents = result
+		.map(item => {
+			return item.contents.map((content: any) => content.value);
+		})
+		.join('\n');
+
+	// We use `.includes` here because the hover can contain content from other plugins.
+	assert.ok(contents.includes(expectedHover.contents.join('')));
 
 	if (expectedHover.range && result[0] && result[0].range) {
 		assert.ok(result[0].range!.isEqual(expectedHover.range!));