Respect Prettier’s use of .editorconfig (#493)

xojs · Aug 10, 2020 · f45ab80 · f45ab80
1 parent 084e7a3
commit f45ab80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/options-manager.js b/lib/options-manager.js
@@ -99,7 +99,7 @@ const mergeWithFileConfig = options => {
 		({options} = applyOverrides(options.filename, options));
 	}
 
-	const prettierOptions = options.prettier ? prettier.resolveConfig.sync(searchPath) || {} : {};
+	const prettierOptions = options.prettier ? prettier.resolveConfig.sync(searchPath, {editorconfig: true}) || {} : {};
 
 	if (options.filename && isTypescript(options.filename)) {
 		const tsConfigExplorer = cosmiconfigSync([], {searchPlaces: ['tsconfig.json'], loaders: {'.json': (_, content) => JSON5.parse(content)}});
@@ -133,8 +133,7 @@ const mergeWithFileConfigs = async (files, options, configFiles) => {
 		const {hash, options: optionsWithOverrides} = applyOverrides(file, fileOptions);
 		fileOptions = optionsWithOverrides;
 
-		const prettierConfigPath = fileOptions.prettier ? await prettier.resolveConfigFile(file) : undefined;
-		const prettierOptions = prettierConfigPath ? await prettier.resolveConfig(file, {config: prettierConfigPath}) : {};
+		const prettierOptions = fileOptions.prettier ? await prettier.resolveConfig(file, {editorconfig: true}) || {} : {};
 
 		let tsConfigPath;
 		if (isTypescript(file)) {
@@ -147,7 +146,7 @@ const mergeWithFileConfigs = async (files, options, configFiles) => {
 			fileOptions.ts = true;
 		}
 
-		const cacheKey = stringify({xoConfigPath, enginesConfigPath, prettierConfigPath, hash, tsConfigPath: fileOptions.tsConfigPath, ts: fileOptions.ts});
+		const cacheKey = stringify({xoConfigPath, enginesConfigPath, prettierOptions, hash, tsConfigPath: fileOptions.tsConfigPath, ts: fileOptions.ts});
 		const cachedGroup = configs.get(cacheKey);
 
 		configs.set(cacheKey, {

diff --git a/test/options-manager.js b/test/options-manager.js
@@ -638,7 +638,7 @@ test('mergeWithFileConfigs: nested configs with prettier', async t => {
 				extensions: DEFAULT_EXTENSION,
 				ignores: DEFAULT_IGNORES
 			},
-			prettierOptions: {semi: false}
+			prettierOptions: {endOfLine: 'lf', semi: false, useTabs: true}
 		}
 	]);
 });