Prettier1.14 fix (prettier#544)

fix prettier#543 eslint integration
fix range formatter
update prettier to 1.14.2

package.json

@@ -200,7 +200,7 @@
   },
   "dependencies": {
     "ignore": "^3.3.8",
-    "prettier": "1.14.0",
+    "prettier": "1.14.2",
     "prettier-eslint": "^8.8.1",
     "prettier-stylelint": "^0.4.2",
     "prettier-tslint": "^0.4.0",

src/PrettierEditProvider.ts

@@ -9,7 +9,7 @@ import {
 } from 'vscode';
 
 import { safeExecution, addToOutput, setUsedModule } from './errorHandler';
-import { getGroup, getParsersFromLanguageId, getConfig } from './utils';
+import { getParsersFromLanguageId, getConfig } from './utils';
 import { requireLocalPkg } from './requirePkg';
 
 import {
@@ -125,9 +125,13 @@ async function format(
     } else {
         parser = dynamicParsers[0];
     }
-    const doesParserSupportEslint = getGroup('JavaScript').some(lang =>
-        lang.parsers.includes(parser)
-    );
+    const doesParserSupportEslint = [
+        'javascript',
+        'javascriptreact',
+        'typescript',
+        'typescriptreact',
+        'vue',
+    ].includes(languageId);
 
     const hasConfig = await hasPrettierConfig(fileName);
 
@@ -167,7 +171,8 @@ async function format(
     if (vscodeConfig.tslintIntegration && parser === 'typescript') {
         return safeExecution(
             () => {
-                const prettierTslint = require('prettier-tslint').format as PrettierTslintFormat;
+                const prettierTslint = require('prettier-tslint')
+                    .format as PrettierTslintFormat;
                 setUsedModule('prettier-tslint', 'Unknown', true);
 
                 return prettierTslint({

src/extension.ts

@@ -8,7 +8,7 @@ import {
 } from 'vscode';
 import EditProvider from './PrettierEditProvider';
 import { setupErrorHandler, registerDisposables } from './errorHandler';
-import { allEnabledLanguages, allJSLanguages, getConfig } from './utils';
+import { allEnabledLanguages, rangeSupportedLanguages, getConfig } from './utils';
 import configFileListener from './configCacheHandler';
 import ignoreFileHandler from './ignoreFileHandler';
 
@@ -37,7 +37,7 @@ function disposeHandlers() {
  */
 function selectors(): Selectors {
     const allLanguages = allEnabledLanguages();
-    const allRangeLanguages = allJSLanguages();
+    const allRangeLanguages = rangeSupportedLanguages();
     const { disableLanguages } = getConfig();
     const globalLanguageSelector = allLanguages.filter(
         l => !disableLanguages.includes(l)

src/utils.ts

@@ -39,13 +39,15 @@ export function allEnabledLanguages(): string[] {
     );
 }
 
-export function allJSLanguages(): string[] {
-    return getGroup('JavaScript')
-        .filter(language => language.group === 'JavaScript')
-        .reduce(
-            (ids, language) => [...ids, ...(language.vscodeLanguageIds || [])],
-            [] as string[]
-        );
+export function rangeSupportedLanguages(): string[] {
+    return [
+        'javascript',
+        'javascriptreact',
+        'typescript',
+        'typescriptreact',
+        'json',
+        'graphql',
+    ];
 }
 
 export function getGroup(group: string): PrettierSupportInfo['languages'] {