summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Rincon <mrincon@gitlab.com>2019-08-30 16:04:40 -0500
committerMiguel Rincon <mrincon@gitlab.com>2019-08-30 16:04:40 -0500
commit394aa08a1efa487143855bb6a189b9d6ac3a5b41 (patch)
tree69186a0ce2a26a7dae6b4cefe935abe08a8c5320
parent663b7bb4771f3261d7451b6e1d74c778fd0e3589 (diff)
downloadgitlab-ce-docs-update-vetur-vscode-extension.tar.gz
Update outdated instructions for vetur in vscodedocs-update-vetur-vscode-extension
-rw-r--r--doc/development/new_fe_guide/style/prettier.md35
1 files changed, 19 insertions, 16 deletions
diff --git a/doc/development/new_fe_guide/style/prettier.md b/doc/development/new_fe_guide/style/prettier.md
index 5f44c640d76..17b209d419e 100644
--- a/doc/development/new_fe_guide/style/prettier.md
+++ b/doc/development/new_fe_guide/style/prettier.md
@@ -61,35 +61,38 @@ This will go over all files in a specific folder and save it.
## VSCode Settings
-### Format on Save
+### Select Prettier as default formatter
-To automatically format your files with Prettier, add the following properties to your User or Workspace Settings:
+To select Prettier as a formatter, add the following properties to your User or Workspace Settings:
```javascript
{
+ "[html]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
"[javascript]": {
- "editor.formatOnSave": true
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
- "editor.formatOnSave": true
- },
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ }
}
```
-### Conflicts with Vetur Extension
+### Format on Save
-There are some [runtime issues](https://github.com/vuejs/vetur/issues/950) with [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) and [the Vetur extension](https://marketplace.visualstudio.com/items?itemName=octref.vetur) for VSCode. To fix this, try adding the following properties to your User or Workspace Settings:
+To automatically format your files with Prettier, add the following properties to your User or Workspace Settings:
```javascript
{
- "prettier.disableLanguages": [],
- "vetur.format.defaultFormatter.html": "none",
- "vetur.format.defaultFormatter.js": "none",
- "vetur.format.defaultFormatter.css": "none",
- "vetur.format.defaultFormatter.less": "none",
- "vetur.format.defaultFormatter.postcss": "none",
- "vetur.format.defaultFormatter.scss": "none",
- "vetur.format.defaultFormatter.stylus": "none",
- "vetur.format.defaultFormatter.ts": "none",
+ "[html]": {
+ "editor.formatOnSave": true
+ },
+ "[javascript]": {
+ "editor.formatOnSave": true
+ },
+ "[vue]": {
+ "editor.formatOnSave": true
+ },
}
```