Skip to content

Switching to prettier from beautify js #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 10, 2021
Merged

Switching to prettier from beautify js #1788

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f3edbef
removed INDENTATION_AMOUNT to avoid cursor jump
satyasaibhushan Feb 25, 2021
218e046
added prettier to tidy code
satyasaibhushan Mar 4, 2021
5c78c2f
made prettier a normal dependency, removed beautify-js
satyasaibhushan Mar 4, 2021
0da016e
retains cursor position when tydying code
satyasaibhushan Mar 4, 2021
43f5054
ignoring errors on syntax errors
satyasaibhushan Mar 4, 2021
d5c661a
[#1223] Move setting cursor offet to prettierFormatWithCursor
catarak Mar 4, 2021
2e8ba08
[#1223] re-add editor focus
catarak Mar 5, 2021
f24120a
Merge branch 'develop' into switching_to_prettier_from_beautify-js
satyasaibhushan Mar 6, 2021
d8fcbdf
Merge branch 'develop' into switching_to_prettier_from_beautify-js
catarak Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions client/modules/IDE/components/Editor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import PropTypes from 'prop-types';
import React from 'react';
import CodeMirror from 'codemirror';
import emmet from '@emmetio/codemirror-plugin';
import beautifyJS from 'js-beautify';
import prettier from 'prettier';
import babelParser from 'prettier/parser-babel';
import htmlParser from 'prettier/parser-html';
import cssParser from 'prettier/parser-postcss';
import { withTranslation } from 'react-i18next';
import 'codemirror/mode/css/css';
import 'codemirror/addon/selection/active-line';
Expand Down Expand Up @@ -59,14 +62,10 @@ import * as ConsoleActions from '../actions/console';

emmet(CodeMirror);

const beautifyCSS = beautifyJS.css;
const beautifyHTML = beautifyJS.html;

window.JSHINT = JSHINT;
window.CSSLint = CSSLint;
window.HTMLHint = HTMLHint;

const IS_TAB_INDENT = false;
const INDENTATION_AMOUNT = 2;

class Editor extends React.Component {
Expand Down Expand Up @@ -336,31 +335,34 @@ class Editor extends React.Component {
this._cm.execCommand('replace');
}

prettierFormatWithCursor(parser, plugins) {
try {
const { formatted, cursorOffset } = prettier.formatWithCursor(
this._cm.doc.getValue(),
{
cursorOffset: this._cm.doc.indexFromPos(this._cm.doc.getCursor()),
parser,
plugins
}
);
this._cm.doc.setValue(formatted);
if (cursorOffset) {
this._cm.doc.setCursor(this._cm.doc.posFromIndex(cursorOffset));
}
} catch (error) {
console.error(error);
}
}

tidyCode() {
const beautifyOptions = {
indent_size: INDENTATION_AMOUNT,
indent_with_tabs: IS_TAB_INDENT
};
const mode = this._cm.getOption('mode');
const currentPosition = this._cm.doc.getCursor();
if (mode === 'javascript') {
this._cm.doc.setValue(
beautifyJS(this._cm.doc.getValue(), beautifyOptions)
);
this.prettierFormatWithCursor('babel', [babelParser]);
} else if (mode === 'css') {
this._cm.doc.setValue(
beautifyCSS(this._cm.doc.getValue(), beautifyOptions)
);
this.prettierFormatWithCursor('css', [cssParser]);
} else if (mode === 'htmlmixed') {
this._cm.doc.setValue(
beautifyHTML(this._cm.doc.getValue(), beautifyOptions)
);
this.prettierFormatWithCursor('html', [htmlParser]);
}
this._cm.focus();
this._cm.doc.setCursor({
line: currentPosition.line,
ch: currentPosition.ch + INDENTATION_AMOUNT
});
}

initializeDocuments(files) {
Expand Down
3 changes: 1 addition & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
"postcss-focus": "^4.0.0",
"postcss-loader": "^4.2.0",
"postcss-preset-env": "^6.7.0",
"prettier": "^2.2.1",
"react-test-renderer": "^16.12.0",
"rimraf": "^2.7.1",
"sass-loader": "^10.1.1",
Expand Down Expand Up @@ -177,7 +176,6 @@
"i18next-http-backend": "^1.0.21",
"is-url": "^1.2.4",
"jest-express": "^1.11.0",
"js-beautify": "^1.10.3",
"jsdom": "^9.8.3",
"jshint": "^2.11.0",
"lodash": "^4.17.19",
Expand All @@ -194,6 +192,7 @@
"passport-google-oauth20": "^1.0.0",
"passport-http": "^0.3.0",
"passport-local": "^1.0.0",
"prettier": "^2.2.1",
"pretty-bytes": "^3.0.1",
"primer-tooltips": "^1.5.11",
"prop-types": "^15.6.2",
Expand Down