Skip to content

Commit 89e0fea

Browse files
authored
Makes prettier async in code quality file (#4026)
1 parent 44ec648 commit 89e0fea

File tree

3 files changed

+17
-37
lines changed

3 files changed

+17
-37
lines changed

code_quality.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const gitChangedFiles = require('git-changed-files');
2-
const prettier = require('@prettier/sync');
2+
const prettier = require('prettier');
33
const prettierConfig = require('./prettier_config.json');
44
const codeQualityConfig = require('./package.json').codeQuality || {};
55
const path = require('path');
@@ -107,16 +107,23 @@ const groupFilesByExtension = (files) => {
107107
* @param file: absolute class path
108108
* @param config: configuration that will be used to prettier the file.
109109
*/
110-
const prettifyFile = (file, config) => {
110+
const prettifyFile = async (file, config) => {
111111
try {
112-
const text = fs.readFileSync(file).toString();
113-
if (prettier.check(text, config) || config?.excludedFiles?.includes(file)) {
112+
if (config?.excludedFiles?.includes(file)) {
114113
return;
115114
}
116115

117-
console.log('Running prettier on the file: ' + file);
118-
fs.writeFileSync(file, prettier.format(text, config));
119-
return true;
116+
const fileContent = fs.readFileSync(file).toString();
117+
const isFormatted = await prettier.check(fileContent, config);
118+
119+
if (!isFormatted) {
120+
console.log('Running prettier on the file: ' + file);
121+
const format = await prettier.format(fileContent, config);
122+
fs.writeFileSync(file, format);
123+
return true;
124+
}
125+
126+
return false;
120127
} catch (error) {
121128
console.log('Error in running prettier the file ' + file + ': \n' + error);
122129
}
@@ -140,8 +147,9 @@ const prettifyFiles = (filesByExtension) => {
140147
);
141148
return;
142149
}
143-
files.forEach((file) => {
144-
if (prettifyFile(file, config)) {
150+
files.forEach(async (file) => {
151+
const action = await prettifyFile(file, config);
152+
if (action) {
145153
filesChanged++;
146154
}
147155
});

package-lock.json

Lines changed: 0 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"full-code-quality-eslint-e2e-tests": "node code_quality.js -- mode=full_eslint sourcePaths=test/e2e-test-application/cypress/e2e/tests report=e2e-test_full_eslint_report.html"
1919
},
2020
"devDependencies": {
21-
"@prettier/sync": "^0.5.2",
2221
"@stylistic/eslint-plugin": "^2.10.1",
2322
"@typescript-eslint/eslint-plugin": "^8.13.0",
2423
"@typescript-eslint/parser": "^8.13.0",

0 commit comments

Comments
 (0)