Automatic merge of gitlab-org/gitlab-ce master

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
+  },
 }
 ```