Merge pull request #1575 from BlakeTnr/main

task/1574 allow overriding prettier parser in config
Accenture · Aug 19, 2024 · c4a8dae · c4a8dae
2 parents c65095a + 1764bd5
commit c4a8dae
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 50 deletions.
diff --git a/@types/lib/util/file.d.ts.map b/@types/lib/util/file.d.ts.map
diff --git a/lib/util/file.js b/lib/util/file.js
@@ -260,57 +260,61 @@ const File = {
  // will throw an error falsely assuming bad syntax
  return await this.beautify_beautyAmp(content, true);
  }
- // load the right prettier config relative to our file
- switch (filetype) {
- case 'htm':
- case 'html': {
- FileFs.prettierConfig.parser = 'html';
- break;
- }
- case 'ssjs':
- case 'js': {
- FileFs.prettierConfig.parser = 'babel';
- break;
- }
- case 'json': {
- FileFs.prettierConfig.parser = 'json';
- break;
- }
- case 'yaml':
- case 'yml': {
- FileFs.prettierConfig.parser = 'yaml';
- break;
- }
- case 'ts': {
- FileFs.prettierConfig.parser = 'babel-ts';
- break;
- }
- case 'css': {
- FileFs.prettierConfig.parser = 'css';
- break;
- }
- case 'less': {
- FileFs.prettierConfig.parser = 'less';
- break;
- }
- case 'sass':
- case 'scss': {
- FileFs.prettierConfig.parser = 'scss';
- break;
- }
- case 'md': {
- FileFs.prettierConfig.parser = 'markdown';
- break;
- }
- case 'sql': {
- FileFs.prettierConfig.parser = 'sql';
- FileFs.prettierConfig.plugins = ['prettier-plugin-sql'];
- break;
- }
- default: {
- FileFs.prettierConfig.parser = 'babel';
+
+ if (!FileFs.prettierConfig.parser) {
+ // load the right prettier config relative to our file
+ switch (filetype) {
+ case 'htm':
+ case 'html': {
+ FileFs.prettierConfig.parser = 'html';
+ break;
+ }
+ case 'ssjs':
+ case 'js': {
+ FileFs.prettierConfig.parser = 'babel';
+ break;
+ }
+ case 'json': {
+ FileFs.prettierConfig.parser = 'json';
+ break;
+ }
+ case 'yaml':
+ case 'yml': {
+ FileFs.prettierConfig.parser = 'yaml';
+ break;
+ }
+ case 'ts': {
+ FileFs.prettierConfig.parser = 'babel-ts';
+ break;
+ }
+ case 'css': {
+ FileFs.prettierConfig.parser = 'css';
+ break;
+ }
+ case 'less': {
+ FileFs.prettierConfig.parser = 'less';
+ break;
+ }
+ case 'sass':
+ case 'scss': {
+ FileFs.prettierConfig.parser = 'scss';
+ break;
+ }
+ case 'md': {
+ FileFs.prettierConfig.parser = 'markdown';
+ break;
+ }
+ case 'sql': {
+ FileFs.prettierConfig.parser = 'sql';
+ FileFs.prettierConfig.plugins = ['prettier-plugin-sql'];
+ break;
+ }
+ default: {
+ FileFs.prettierConfig.parser = 'babel';
+ }
  }
  }
+
  formatted = await prettier.format(content, FileFs.prettierConfig);
  } catch (ex) {
  // save prettier errror into log file